From dd0009803553d55b5d75384c83cc7d62b258f40f Mon Sep 17 00:00:00 2001 From: David Dworken Date: Sun, 19 Nov 2023 01:44:48 -0800 Subject: [PATCH] More text fixes --- client/client_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client/client_test.go b/client/client_test.go index 70009f8..175b327 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -457,7 +457,9 @@ hishtory disable`) require.NotContains(t, out, "cmd_with_diff_hostname_and_username") out = hishtoryQuery(t, tester, `-echo -pipefail`) require.NotContains(t, out, "echo") - if strings.Count(out, "\n") != 4 { + require.NotContains(t, out, "pipefail") + require.Contains(t, out, "cmd_with_diff_hostname_and_username") + if strings.Count(out, "\n") != 6 { t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out) } @@ -1395,9 +1397,7 @@ ls /tmp`, randomCmdUuid, randomCmdUuid) // Redact it without HISHTORY_REDACT_FORCE out, err := tester.RunInteractiveShellRelaxed(t, `yes | hishtory redact hello`) require.NoError(t, err) - if out != "This will permanently delete 1 entries, are you sure? [y/N] " { - t.Fatalf("hishtory redact gave unexpected output=%#v", out) - } + require.Regexp(t, regexp.MustCompile(`This will permanently delete (1|2) entries, are you sure\? \[y/N] `), out) // And check it was redacted out = tester.RunInteractiveShell(t, `hishtory export | grep -v pipefail`) @@ -1974,7 +1974,7 @@ func testControlR(t *testing.T, tester shellTester, shellName string, onlineStat // Check that they're there var historyEntries []*data.HistoryEntry db.Model(&data.HistoryEntry{}).Find(&historyEntries) - if len(historyEntries) != 6 { + if len(historyEntries) != 5 { t.Fatalf("expected to find 6 history entries, actual found %d: %#v", len(historyEntries), historyEntries) }