Remzona54/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2026-08-31 23:03:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix API Server E2E test using npipe on windows, not sockets

Browse source
This commit is contained in:
guillaume.tardif 2020-06-08 17:08:54 +02:00 • committed by Guillaume Tardif
parent bed0b81343
commit c92df92d29
2 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/framework/suite.go
View file

@ -122,13 +122,13 @@ func (s *Suite) AfterTest(suite, test string) {
// ListProcessesCommand creates a command to list processes, "tasklist" on windows, "ps" otherwise.
func (s *Suite) ListProcessesCommand() *CmdContext {
if isWindows() {
if IsWindows() {
return s.NewCommand("tasklist")
}
return s.NewCommand("ps")
}
func isWindows() bool {
func IsWindows() bool {
return runtime.GOOS == "windows"
}
@ -142,14 +142,14 @@ func (s *Suite) NewCommand(command string, args ...string) *CmdContext {
}
func dockerExecutable() string {
if isWindows() {
if IsWindows() {
return "docker.exe"
}
return "docker"
}
func DockerClassicExecutable() string {
if isWindows() {
if IsWindows() {
return "docker-classic.exe"
}
return "docker-classic"