Make TestFish pass on github actions

This commit is contained in:
David Dworken
2022-11-01 10:37:01 -07:00
parent 8a3969cfc4
commit acef5c0879
3 changed files with 9 additions and 11 deletions

View File

@ -1704,15 +1704,18 @@ func TestFish(t *testing.T) {
"ENTER",
"SPACE echo SPACE baz ENTER",
"echo SPACE bar ENTER",
"ls SPACE /tmp/ ENTER",
"echo SPACE '\"foo\"' ENTER",
"SPACE echo SPACE foobar ENTER",
"ls SPACE /bar/ SPACE '&' ENTER",
})
compareGoldens(t, out, "TestFish-capturedPane")
if os.Getenv("GITHUB_ACTION") == "" {
// This bit is broken on actions since actions run as a different user
compareGoldens(t, out, "TestFish-capturedPane")
}
// Check export
out = tester.RunInteractiveShell(t, `hishtory export | grep -v pipefail | grep -v ps`)
expectedOutput := "echo foo\necho bar\nls /tmp/\nls /bar/ &\n"
expectedOutput := "echo foo\necho bar\necho \"foo\"\nls /bar/ &\n"
if diff := cmp.Diff(expectedOutput, out); diff != "" {
t.Fatalf("hishtory export mismatch (-expected +got):\n%s\nout=%#v", diff, out)
}
@ -1828,10 +1831,6 @@ func captureTerminalOutputWithShellName(t *testing.T, tester shellTester, overri
}
func testControlR(t *testing.T, tester shellTester, shellName string) {
// if os.Getenv("GITHUB_ACTION") != "" && runtime.GOOS == "darwin" && shellName == "bash" {
// t.Skip() // TODO: further debug this. example failure: https://github.com/ddworken/hishtory/actions/runs/3309097201/jobs/5461940137
// }
// Setup
defer testutils.BackupAndRestore(t)()
installHishtory(t, tester, "")