diff --git a/client/client_test.go b/client/client_test.go index 839bcac..b6f4b04 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -230,7 +230,8 @@ func testIntegrationWithNewDevice(t *testing.T, tester shellTester) { } // Set the secret key to the previous secret key - out, err := tester.RunInteractiveShellRelaxed(t, `yes | hishtory init `+userSecret) + out, err := tester.RunInteractiveShellRelaxed(t, ` export HISHTORY_SKIP_INIT_IMPORT=1 +yes | hishtory init `+userSecret) testutils.Check(t, err) if !strings.Contains(out, "Setting secret hishtory key to "+userSecret) { t.Fatalf("Failed to re-init with the user secret: %v", out) @@ -2119,7 +2120,7 @@ func TestTimestampFormat(t *testing.T) { if err != nil { t.Fatalf("failed to load timezone: %v", err) } - entry1 := testutils.MakeFakeHistoryEntry("table_cmd1") + entry1 := testutils.MakeFakeHistoryEntry("table_cmd1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa") entry1.StartTime = time.Unix(1650096186, 0).In(tmz) entry1.EndTime = time.Unix(1650096190, 0).In(tmz) manuallySubmitHistoryEntry(t, userSecret, entry1) diff --git a/client/lib/goldens/TestTimestampFormat-query b/client/lib/goldens/TestTimestampFormat-query index 1ad1ec9..ca1b729 100644 --- a/client/lib/goldens/TestTimestampFormat-query +++ b/client/lib/goldens/TestTimestampFormat-query @@ -1,3 +1,3 @@ -Hostname CWD Timestamp Runtime Exit Code Command -localhost ~/foo/ 2022/Apr/16 01:03 24s 3 table_cmd2 -localhost /tmp/ 2022/Apr/16 01:03 4s 2 table_cmd1 +Hostname CWD Timestamp Runtime Exit Code Command +localhost ~/foo/ 2022/Apr/16 01:03 24s 3 table_cmd2 +localhost /tmp/ 2022/Apr/16 01:03 4s 2 table_cmd1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/client/lib/goldens/TestTimestampFormat-tquery b/client/lib/goldens/TestTimestampFormat-tquery index 9f7bbc3..d9d6465 100644 --- a/client/lib/goldens/TestTimestampFormat-tquery +++ b/client/lib/goldens/TestTimestampFormat-tquery @@ -4,27 +4,27 @@ Search Query: > -pipefail -tablesizing -┌────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ -│ Hostname CWD Timestamp Runtime Exit Code Command │ -│────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ -│ localhost ~/foo/ 2022/Apr/16 01:03 24s 3 table_cmd2 │ -│ localhost /tmp/ 2022/Apr/16 01:03 4s 2 table_cmd1 │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file +┌───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ +│ Hostname CWD Timestamp Runtime Exit Code Command │ +│───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ +│ localhost ~/foo/ 2022/Apr/16 01:03 24s 3 table_cmd2 │ +│ localhost /tmp/ 2022/Apr/16 01:03 4s 2 table_cmd1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa… │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +│ │ +└───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/client/lib/goldens/TestTimestampFormat-tquery-isAction b/client/lib/goldens/TestTimestampFormat-tquery-isAction deleted file mode 100644 index b2a5920..0000000 --- a/client/lib/goldens/TestTimestampFormat-tquery-isAction +++ /dev/null @@ -1,30 +0,0 @@ --pipefail -tablesizing - - - -Search Query: > -pipefail -tablesizing - -┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐ -│ Hostname CWD Timestamp Runtime Exit Code Command │ -│─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────│ -│ localhost ~/foo/ 2022/Apr/16 01:03 24s 3 table_cmd2 │ -│ localhost /tmp/ 2022/Apr/16 01:03 4s 2 table_cmd1 │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -│ │ -└─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘ \ No newline at end of file