extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2024-11-26 18:23:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

More fixes for github action failures + add link to where to file a bug

Browse Source
This commit is contained in:
David Dworken 2022-11-13 06:42:37 -08:00
parent e6b1bfd589
commit 3e2373d76e
No known key found for this signature in database
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/client_test.go
View File

@ -2282,12 +2282,9 @@ func testMultipleUsers(t *testing.T, tester shellTester) {
// Check that the right commands were recorded for user2
for i, d := range []device{u2d1, u2d2, u2d3} {
switchToDevice(&devices, d)
out, err := tester.RunInteractiveShellRelaxed(t, `hishtory export`)
out, err := tester.RunInteractiveShellRelaxed(t, `hishtory export -export -pipefail`)
testutils.Check(t, err)
expectedOutput := "echo u2d1\necho u2d2\necho u2d3\necho u1d1-b\necho u1d1-c\necho u2d3-b\necho u2d3-c\n"
for j := 0; j < i; j++ {
expectedOutput += "hishtory export\n"
}
if diff := cmp.Diff(expectedOutput, out); diff != "" {
t.Fatalf("hishtory export mismatch (-expected +got):\n%s\nout=%#v", diff, out)
}

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

@ -17,8 +17,5 @@ ghaction-runner-hostname 0 echo thisisrecorded
ghaction-runner-hostname 0 hishtory enable
ghaction-runner-hostname 0 echo bar
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 status

4
client/lib/lib.go
View File

@ -311,11 +311,11 @@ func parseCrossPlatformInt(data string) (int64, error) {
func getLastCommand(history string) (string, error) {
split := strings.SplitN(strings.TrimSpace(history), " ", 2)
if len(split) <= 1 {
return "", fmt.Errorf("got unexpected bash history line: %#v, please open a bug", history)
return "", fmt.Errorf("got unexpected bash history line: %#v, please open a bug at github.com/ddworken/hishtory", history)
}
split = strings.SplitN(split[1], " ", 2)
if len(split) <= 1 {
return "", fmt.Errorf("got unexpected bash history line: %#v, please open a bug", history)
return "", fmt.Errorf("got unexpected bash history line: %#v, please open a bug at github.com/ddworken/hishtory", history)
}
return split[1], nil
}