From 43f9213fcc9d993b5d93dc9a2219635653134163 Mon Sep 17 00:00:00 2001 From: mitchell Date: Fri, 18 Aug 2023 12:35:25 -0400 Subject: [PATCH] Use zsh instead of bash in macOS integration tests. --- test/integration/shell_int_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/integration/shell_int_test.go b/test/integration/shell_int_test.go index 4957ba6f7b..32fb826953 100644 --- a/test/integration/shell_int_test.go +++ b/test/integration/shell_int_test.go @@ -7,6 +7,7 @@ import ( "runtime" "testing" + "github.com/ActiveState/cli/internal/condition" "github.com/ActiveState/cli/internal/config" "github.com/ActiveState/cli/internal/constants" "github.com/ActiveState/cli/internal/fileutils" @@ -292,6 +293,9 @@ func (suite *ShellIntegrationTestSuite) TestNestedShellNotification() { os.Setenv(constants.HomeEnvVarName, ts.Dirs.HomeDir) defer func() { os.Unsetenv(constants.HomeEnvVarName) }() ss := subshell.New(cfg) + if runtime.GOOS == "darwin" && condition.OnCI() { + ss = &zsh.SubShell{} // GitHub actions runs on bash, so override with zsh + } err = subshell.ConfigureAvailableShells(ss, cfg, nil, sscommon.InstallID, true) // mimic installer suite.Require().NoError(err)