From 870243df744cf2ccba6c220184d5d0154f3f7b39 Mon Sep 17 00:00:00 2001 From: David Dworken Date: Sun, 15 Sep 2024 22:00:11 -0700 Subject: [PATCH] More test fixes --- .github/workflows/go-test.yml | 10 +++++----- client/client_test.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/go-test.yml b/.github/workflows/go-test.yml index e50df19..c54aeff 100644 --- a/.github/workflows/go-test.yml +++ b/.github/workflows/go-test.yml @@ -105,11 +105,11 @@ jobs: with: name: goldens-used-${{ matrix.os }}-${{ matrix.test_shard }} path: /tmp/goldens-used.txt - - name: Setup tmate session - if: ${{ failure() }} - uses: mxschmitt/action-tmate@v3 - with: - limit-access-to-actor: true + # - name: Setup tmate session + # if: ${{ failure() }} + # uses: mxschmitt/action-tmate@v3 + # with: + # limit-access-to-actor: true check-goldens: runs-on: ubuntu-latest needs: test diff --git a/client/client_test.go b/client/client_test.go index 4504444..03609a1 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -2478,7 +2478,7 @@ echo bar`) out = tester.RunInteractiveShell(t, `hishtory query -pipefail`) testutils.CompareGoldens(t, out, fmt.Sprintf("testCustomColumns-query-isAction=%v", testutils.IsGithubAction())) out = captureTerminalOutput(t, tester, []string{"hishtory SPACE tquery SPACE ENTER", "-pipefail"}) - out = stripRequiredPrefix(t, out, "hishtory tquery -pipefail") + out = stripRequiredPrefix(t, out, "hishtory tquery") testName := "testCustomColumns-tquery-" + tester.ShellName() if testutils.IsGithubAction() { testName += "-isAction" @@ -2735,7 +2735,7 @@ func TestTimestampFormat(t *testing.T) { out := hishtoryQuery(t, tester, "-pipefail -tablesizing") testutils.CompareGoldens(t, out, "TestTimestampFormat-query") out = captureTerminalOutput(t, tester, []string{"hishtory SPACE tquery ENTER", "-pipefail SPACE -tablesizing"}) - out = stripRequiredPrefix(t, out, "hishtory tquery -pipefail -tablesizing") + out = stripRequiredPrefix(t, out, "hishtory tquery") testutils.CompareGoldens(t, out, "TestTimestampFormat-tquery") } @@ -2836,7 +2836,7 @@ echo foo`) out = tester.RunInteractiveShell(t, `hishtory query -pipefail`) testutils.CompareGoldens(t, out, "testRemoveDuplicateRows-query") out = captureTerminalOutput(t, tester, []string{"hishtory SPACE tquery ENTER", "-pipefail"}) - out = stripRequiredPrefix(t, out, "hishtory tquery -pipefail") + out = stripRequiredPrefix(t, out, "hishtory tquery") testutils.CompareGoldens(t, out, "testRemoveDuplicateRows-tquery") // And change the config to filter out duplicate rows @@ -2852,7 +2852,7 @@ echo foo`) // Check tquery out = captureTerminalOutput(t, tester, []string{"hishtory SPACE tquery ENTER", "-pipefail"}) - out = stripRequiredPrefix(t, out, "hishtory tquery -pipefail") + out = stripRequiredPrefix(t, out, "hishtory tquery") testutils.CompareGoldens(t, out, "testRemoveDuplicateRows-enabled-tquery") // Check actually selecting it with query