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

Fix tests failing on Github actions

Browse Source
This commit is contained in:
David Dworken 2022-04-17 11:24:55 -07:00
parent 7ea6427cf7
commit 824c1853c1
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
client/client_test.go
View File

@ -350,21 +350,21 @@ hishtory disable`)
} }
// Query based on before: and cwd: // Query based on before: and cwd:
out = hishtoryQuery(t, `before:2025-07-02 cwd:/tmp`) out = hishtoryQuery(t, `before:2125-07-02 cwd:/tmp`)
if strings.Count(out, "\n") != 3 { if strings.Count(out, "\n") != 3 {
t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out) t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out)
} }
out = hishtoryQuery(t, `before:2025-07-02 cwd:tmp`) out = hishtoryQuery(t, `before:2125-07-02 cwd:tmp`)
if strings.Count(out, "\n") != 3 { if strings.Count(out, "\n") != 3 {
t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out) t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out)
} }
out = hishtoryQuery(t, `before:2025-07-02 cwd:mp`) out = hishtoryQuery(t, `before:2125-07-02 cwd:mp`)
if strings.Count(out, "\n") != 3 { if strings.Count(out, "\n") != 3 {
t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out) t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out)
} }
// Query based on after: and cwd: // Query based on after: and cwd:
out = hishtoryQuery(t, `after:2020-07-02 cwd:/tmp`) out = hishtoryQuery(t, `after:1980-07-02 cwd:/tmp`)
if strings.Count(out, "\n") != 3 { if strings.Count(out, "\n") != 3 {
t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out) t.Fatalf("hishtory query has the wrong number of lines=%d, out=%#v", strings.Count(out, "\n"), out)
} }
@ -449,6 +449,11 @@ hishtory disable`)
} }
func TestUpdate(t *testing.T) { func TestUpdate(t *testing.T) {
if runtime.GOOS != "linux" {
// TODO: Once updates work for non-linux platforms, remove this
t.Skip()
}
// Set up // Set up
defer shared.BackupAndRestore(t)() defer shared.BackupAndRestore(t)()
userSecret := installHishtory(t, "") userSecret := installHishtory(t, "")
@ -622,9 +627,17 @@ echo hello2
} }
} }
func getPidofCommand() string {
if runtime.GOOS == "darwin" {
// MacOS doesn't have pidof by default
return "pgrep"
}
return "pidof"
}
func waitForBackgroundSavesToComplete(t *testing.T) { func waitForBackgroundSavesToComplete(t *testing.T) {
for i := 0; i < 20; i++ { for i := 0; i < 20; i++ {
cmd := exec.Command("pidof", "hishtory") cmd := exec.Command(getPidofCommand(), "hishtory")
var stdout bytes.Buffer var stdout bytes.Buffer
var stderr bytes.Buffer var stderr bytes.Buffer
cmd.Stdout = &stdout cmd.Stdout = &stdout