Make TestPoweroffOnNewVersion work on Windows, fixes #2979 (#3031)

cmd/ddev/cmd/root_test.go

@@ -5,8 +5,10 @@ import (
 	"github.com/drud/ddev/pkg/dockerutil"
 	"github.com/drud/ddev/pkg/globalconfig"
 	"github.com/drud/ddev/pkg/nodeps"
+	"github.com/drud/ddev/pkg/util"
 	"github.com/stretchr/testify/require"
 	"os"
+	"runtime"
 	"strconv"
 	"testing"
 	"time"
@@ -255,22 +257,29 @@ func TestPoweroffOnNewVersion(t *testing.T) {
 		})
 
 	newStartTime := time.Now().Unix()
+	// Flaky test failures, possible failure of sync in docker desktop for Windows?
+	if runtime.GOOS == "windows" {
+		time.Sleep(5 * time.Second)
+	}
 	// We have to do the echo technique to get past the prompt about doing a ddev poweroff
-	out, err := exec.RunCommand("bash", []string{"-c", fmt.Sprintf("echo y | %s start", DdevBin)})
+	// On Windows we have to make sure we have git-bash, not the Windows bash.exe
+	bashPath := util.FindWindowsBashPath()
+	out, err := exec.RunCommand(bashPath, []string{"-c", fmt.Sprintf("echo y | '%s' start", DdevBin)})
 	assert.NoError(err)
 	assert.Contains(out, "ddev-ssh-agent container has been removed")
+	assert.Contains(out, "ssh-agent container is running")
 
 	apps = ddevapp.GetActiveProjects()
 	activeCount = len(apps)
 	assert.Equal(activeCount, 1)
 
 	// Verify that the ddev-router and ddev-ssh-agent have just been newly created
 	routerC, err := dockerutil.FindContainerByName("ddev-router")
-	assert.NoError(err)
+	require.NoError(t, err)
 	require.NotEmpty(t, routerC)
 	routerCreateTime := (*routerC).Created
 	sshC, err := dockerutil.FindContainerByName("ddev-ssh-agent")
-	assert.NoError(err)
+	require.NoError(t, err)
 	require.NotEmpty(t, sshC)
 	sshCreateTime := (*sshC).Created
 

pkg/util/utils.go

@@ -155,10 +155,13 @@ func GetFirstWord(s string) string {
 }
 
 // FindWindowsBashPath returns the PATH to bash on Windows
-// preferring git-bash
+// preferring git-bash (or just "bash" elsewhere)
 // On Windows we'll need the path to bash to execute anything.
 // Returns empty string if not found, path if found
 func FindWindowsBashPath() string {
+	if runtime.GOOS != "windows" {
+		return "bash"
+	}
 	windowsBashPath, err := osexec.LookPath(`C:\Program Files\Git\bin\bash.exe`)
 	if err != nil {
 		// This one could come back with the WSL bash, in which case we may have some trouble.