extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-05-02 21:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

More changes to make tests pass on github actions

Browse Source
This commit is contained in:
David Dworken 2022-11-13 06:25:16 -08:00
parent 7005e15b15
commit 0cfb8249d9
No known key found for this signature in database
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/client_test.go
View File

@ -296,7 +296,7 @@ yes | hishtory init `+userSecret)
// And test the table but with a subset of columns that is static // And test the table but with a subset of columns that is static
tester.RunInteractiveShell(t, `hishtory config-set displayed-columns Hostname 'Exit Code' Command`) tester.RunInteractiveShell(t, `hishtory config-set displayed-columns Hostname 'Exit Code' Command`)
out = tester.RunInteractiveShell(t, `hishtory query -pipefail | grep -v 'hishtory init '`) out = tester.RunInteractiveShell(t, `hishtory query -pipefail | grep -v 'hishtory init ' | grep -v 'ls /'`)
compareGoldens(t, out, "testIntegrationWithNewDevice-table"+tester.ShellName()) compareGoldens(t, out, "testIntegrationWithNewDevice-table"+tester.ShellName())
} }
@ -2261,14 +2261,11 @@ func testMultipleUsers(t *testing.T, tester shellTester) {
_, _ = tester.RunInteractiveShellRelaxed(t, `echo u1d2-c`) _, _ = tester.RunInteractiveShellRelaxed(t, `echo u1d2-c`)
// Check that the right commands were recorded for user1 // Check that the right commands were recorded for user1
for i, d := range []device{u1d1, u1d2} { for _, d := range []device{u1d1, u1d2} {
switchToDevice(&devices, d) switchToDevice(&devices, d)
out, err := tester.RunInteractiveShellRelaxed(t, `hishtory export -pipefail`) out, err := tester.RunInteractiveShellRelaxed(t, `hishtory export -pipefail -export`)
testutils.Check(t, err) testutils.Check(t, err)
expectedOutput := "echo u1d1\necho u1d2\necho u1d1-b\necho u1d1-c\necho u1d2-b\necho u1d2-c\n" expectedOutput := "echo u1d1\necho u1d2\necho u1d1-b\necho u1d1-c\necho u1d2-b\necho u1d2-c\n"
for j := 0; j < i; j++ {
expectedOutput += "hishtory export\n"
}
if diff := cmp.Diff(expectedOutput, out); diff != "" { if diff := cmp.Diff(expectedOutput, out); diff != "" {
t.Fatalf("hishtory export mismatch (-expected +got):\n%s\nout=%#v", diff, out) t.Fatalf("hishtory export mismatch (-expected +got):\n%s\nout=%#v", diff, out)
} }
@ -2421,6 +2418,7 @@ func FuzzTestMultipleUsers(f *testing.F) {
if skipSlowTests() { if skipSlowTests() {
f.Skip("skipping slow tests") f.Skip("skipping slow tests")
} }
defer testutils.RunTestServer()()
// Format: // Format:
// $Op = $Key;$Device|$Command\n // $Op = $Key;$Device|$Command\n
// $Key;$Device|$Command\n$Op // $Key;$Device|$Command\n$Op

3
client/lib/goldens/testIntegrationWithNewDevice-tablebash
View File

@ -17,8 +17,5 @@ ghaction-runner-hostname 0 echo thisisrecorded
ghaction-runner-hostname 0 hishtory enable ghaction-runner-hostname 0 hishtory enable
ghaction-runner-hostname 0 echo bar ghaction-runner-hostname 0 echo bar
ghaction-runner-hostname 0 echo foo ghaction-runner-hostname 0 echo foo
ghaction-runner-hostname 1 ls /foo
ghaction-runner-hostname 1 ls /bar
ghaction-runner-hostname 1 ls /a
ghaction-runner-hostname 0 hishtory query ghaction-runner-hostname 0 hishtory query
ghaction-runner-hostname 0 hishtory status ghaction-runner-hostname 0 hishtory status