1berry/docker-compose
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

one more windows adaptation

Browse Source 
Signed-off-by: guillaume.tardif <guillaume.tardif@gmail.com>
This commit is contained in:
guillaume.tardif 2021-04-23 12:56:55 +02:00
parent 95179f1625
commit df7f57e227
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
local/e2e/compose/compose_test.go
View File

@ -23,6 +23,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"regexp" "regexp"
"runtime"
"strings" "strings"
"testing" "testing"
"time" "time"
@ -132,21 +133,31 @@ func TestLocalComposeUp(t *testing.T) {
}) })
} }
func binExt() string {
binaryExt := ""
if runtime.GOOS == "windows" {
binaryExt = ".exe"
}
return binaryExt
}
func TestComposeUsingCliPlugin(t *testing.T) { func TestComposeUsingCliPlugin(t *testing.T) {
c := NewParallelE2eCLI(t, binDir) c := NewParallelE2eCLI(t, binDir)
err := os.Remove(filepath.Join(c.ConfigDir, "cli-plugins", "docker-compose")) err := os.Remove(filepath.Join(c.ConfigDir, "cli-plugins", "docker-compose"+binExt()))
assert.NilError(t, err) assert.NilError(t, err)
res := c.RunDockerOrExitError("compose", "ls") res := c.RunDockerOrExitError("compose", "ls")
res.Assert(t, icmd.Expected{Err: "'compose' is not a docker command", ExitCode: 1}) res.Assert(t, icmd.Expected{Err: "'compose' is not a docker command", ExitCode: 1})
} }
func TestComposeCliPluginWithoutCloudIntegration(t *testing.T) { func TestComposeCliPluginWithoutCloudIntegration(t *testing.T) {
c := NewParallelE2eCLI(t, binDir) newBinFolder, cleanup, err := SetupExistingCLI() // do not share bin folder with other tests
err := os.Remove(filepath.Join(binDir, "docker"))
assert.NilError(t, err) assert.NilError(t, err)
err = os.Rename(filepath.Join(binDir, "com.docker.cli"), filepath.Join(binDir, "docker")) defer cleanup()
c := NewParallelE2eCLI(t, newBinFolder)
err = os.Remove(filepath.Join(newBinFolder, "docker"+binExt()))
assert.NilError(t, err)
err = os.Rename(filepath.Join(newBinFolder, "com.docker.cli"+binExt()), filepath.Join(newBinFolder, "docker"+binExt()))
assert.NilError(t, err) assert.NilError(t, err)
res := c.RunDockerOrExitError("compose", "ls") res := c.RunDockerOrExitError("compose", "ls")
res.Assert(t, icmd.Expected{Out: "NAME STATUS", ExitCode: 0}) res.Assert(t, icmd.Expected{Out: "NAME STATUS", ExitCode: 0})