From a4ab2827d8b6e706b2420700045d889a3a69f3f2 Mon Sep 17 00:00:00 2001 From: Randy Fay Date: Fri, 15 May 2020 17:26:38 -0600 Subject: [PATCH] Skip tests that are too difficult for Windows Docker (#2261) --- cmd/ddev/cmd/describe_test.go | 6 ++++++ cmd/ddev/cmd/pause_test.go | 6 ++++++ cmd/ddev/cmd/start_test.go | 6 ++++++ cmd/ddev/cmd/stop_test.go | 5 +++++ pkg/ddevapp/ddevapp_test.go | 11 +++++++++++ 5 files changed, 34 insertions(+) diff --git a/cmd/ddev/cmd/describe_test.go b/cmd/ddev/cmd/describe_test.go index 51962bd909d..c7d3b5914e0 100644 --- a/cmd/ddev/cmd/describe_test.go +++ b/cmd/ddev/cmd/describe_test.go @@ -3,6 +3,7 @@ package cmd import ( "github.com/drud/ddev/pkg/dockerutil" "github.com/stretchr/testify/require" + "runtime" "strings" "testing" @@ -219,6 +220,11 @@ func unmarshalJSONLogs(in string) ([]log.Fields, error) { func TestCmdDescribeMissingProjectDirectory(t *testing.T) { var err error var out string + + if runtime.GOOS == "windows" { + t.Skip("Skipping because unreliable on Windows") + } + assert := asrt.New(t) projDir, _ := os.Getwd() diff --git a/cmd/ddev/cmd/pause_test.go b/cmd/ddev/cmd/pause_test.go index 09b77875b71..721b7bd6999 100644 --- a/cmd/ddev/cmd/pause_test.go +++ b/cmd/ddev/cmd/pause_test.go @@ -4,6 +4,7 @@ import ( "github.com/drud/ddev/pkg/dockerutil" "github.com/stretchr/testify/require" "os" + "runtime" "testing" "path/filepath" @@ -64,6 +65,11 @@ func TestCmdPauseContainers(t *testing.T) { func TestCmdPauseContainersMissingProjectDirectory(t *testing.T) { var err error var out string + + if runtime.GOOS == "windows" { + t.Skip("Skipping because unreliable on Windows") + } + assert := asrt.New(t) projDir, _ := os.Getwd() diff --git a/cmd/ddev/cmd/start_test.go b/cmd/ddev/cmd/start_test.go index b8927520bed..f29b690deb0 100644 --- a/cmd/ddev/cmd/start_test.go +++ b/cmd/ddev/cmd/start_test.go @@ -4,6 +4,7 @@ import ( "github.com/drud/ddev/pkg/dockerutil" "github.com/stretchr/testify/require" "path/filepath" + "runtime" "testing" "os" @@ -62,6 +63,11 @@ func TestCmdStart(t *testing.T) { func TestCmdStartMissingProjectDirectory(t *testing.T) { var err error var out string + + if runtime.GOOS == "windows" { + t.Skip("Skipping because unreliable on Windows") + } + assert := asrt.New(t) projDir, _ := os.Getwd() diff --git a/cmd/ddev/cmd/stop_test.go b/cmd/ddev/cmd/stop_test.go index 701acc50eb8..be8a9be55e9 100644 --- a/cmd/ddev/cmd/stop_test.go +++ b/cmd/ddev/cmd/stop_test.go @@ -65,6 +65,11 @@ func TestCmdStop(t *testing.T) { func TestCmdStopMissingProjectDirectory(t *testing.T) { var err error var out string + + if runtime.GOOS == "windows" { + t.Skip("Skipping because unreliable on Windows") + } + assert := asrt.New(t) projDir, _ := os.Getwd() diff --git a/pkg/ddevapp/ddevapp_test.go b/pkg/ddevapp/ddevapp_test.go index 0d174885983..5290732ace4 100644 --- a/pkg/ddevapp/ddevapp_test.go +++ b/pkg/ddevapp/ddevapp_test.go @@ -1948,6 +1948,10 @@ func TestDdevPause(t *testing.T) { // TestDdevStopMissingDirectory tests that the 'ddev stop' command works properly on sites with missing directories or ddev configs. func TestDdevStopMissingDirectory(t *testing.T) { + if runtime.GOOS == "windows" { + t.Skip("Skipping because unreliable on Windows") + } + assert := asrt.New(t) site := TestSites[0] @@ -2050,6 +2054,10 @@ func TestDdevDescribe(t *testing.T) { // TestDdevDescribeMissingDirectory tests that the describe command works properly on sites with missing directories or ddev configs. func TestDdevDescribeMissingDirectory(t *testing.T) { + if runtime.GOOS == "windows" { + t.Skip("Skipping because unreliable on Windows") + } + assert := asrt.New(t) site := TestSites[0] tempPath := testcommon.CreateTmpDir("site-copy") @@ -2266,6 +2274,9 @@ func TestRouterNotRunning(t *testing.T) { // TestListWithoutDir prevents regression where ddev list panics if one of the // sites found is missing a directory func TestListWithoutDir(t *testing.T) { + if runtime.GOOS == "windows" { + t.Skip("Skipping because unreliable on Windows") + } // Set up tests and give ourselves a working directory. assert := asrt.New(t) testcommon.ClearDockerEnv()