integration-cli: remove defaultSleepImage constant

thaJeztah · thaJeztah · commit a63a02fefd32 · 2019-09-25T17:25:20.000+02:00
Both Linux and Windows now use busybox, so no need to keep a constant for this. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 27f432c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/integration-cli/benchmark_test.go b/integration-cli/benchmark_test.go
@@ -28,7 +28,7 @@ func (s *DockerSuite) BenchmarkConcurrentContainerActions(c *check.C) {
 			go func() {
 				defer innerGroup.Done()
 				for i := 0; i < numIterations; i++ {
-					args := []string{"run", "-d", defaultSleepImage}
+					args := []string{"run", "-d", "busybox"}
 					args = append(args, sleepCommandForDaemonPlatform()...)
 					out, _, err := dockerCmdWithError(args...)
 					if err != nil {
diff --git a/integration-cli/docker_cli_service_scale_test.go b/integration-cli/docker_cli_service_scale_test.go
@@ -14,11 +14,11 @@ func (s *DockerSwarmSuite) TestServiceScale(c *check.C) {
 	d := s.AddDaemon(c, true, true)
 
 	service1Name := "TestService1"
-	service1Args := append([]string{"service", "create", "--detach", "--no-resolve-image", "--name", service1Name, defaultSleepImage}, sleepCommandForDaemonPlatform()...)
+	service1Args := append([]string{"service", "create", "--detach", "--no-resolve-image", "--name", service1Name, "busybox"}, sleepCommandForDaemonPlatform()...)
 
 	// global mode
 	service2Name := "TestService2"
-	service2Args := append([]string{"service", "create", "--detach", "--no-resolve-image", "--name", service2Name, "--mode=global", defaultSleepImage}, sleepCommandForDaemonPlatform()...)
+	service2Args := append([]string{"service", "create", "--detach", "--no-resolve-image", "--name", service2Name, "--mode=global", "busybox"}, sleepCommandForDaemonPlatform()...)
 
 	// Create services
 	_, err := d.Cmd(service1Args...)
diff --git a/integration-cli/docker_utils_test.go b/integration-cli/docker_utils_test.go
@@ -347,7 +347,7 @@ func getInspectBody(c *check.C, version, id string) []byte {
 // Run a long running idle task in a background container using the
 // system-specific default image and command.
 func runSleepingContainer(c *check.C, extraArgs ...string) string {
-	return runSleepingContainerInImage(c, defaultSleepImage, extraArgs...)
+	return runSleepingContainerInImage(c, "busybox", extraArgs...)
 }
 
 // Run a long running idle task in a background container using the specified
diff --git a/integration-cli/test_vars_unix_test.go b/integration-cli/test_vars_unix_test.go
@@ -7,8 +7,4 @@ const (
 	isUnixCli = true
 
 	expectedFileChmod = "-rw-r--r--"
-
-	// On Unix variants, the busybox image comes with the `top` command which
-	// runs indefinitely while still being interruptible by a signal.
-	defaultSleepImage = "busybox"
 )
diff --git a/integration-cli/test_vars_windows_test.go b/integration-cli/test_vars_windows_test.go
@@ -8,8 +8,4 @@ const (
 
 	// this is the expected file permission set on windows: gh#11395
 	expectedFileChmod = "-rwxr-xr-x"
-
-	// On Windows, the busybox image doesn't have the `top` command, so we rely
-	// on `sleep` with a high duration.
-	defaultSleepImage = "busybox"
 )

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ func getInspectBody(c *check.C, version, id string) []byte {`
`347`	`347`	`// Run a long running idle task in a background container using the`
`348`	`348`	`// system-specific default image and command.`
`349`	`349`	`func runSleepingContainer(c *check.C, extraArgs ...string) string {`
`350`		`- return runSleepingContainerInImage(c, defaultSleepImage, extraArgs...)`
	`350`	`+ return runSleepingContainerInImage(c, "busybox", extraArgs...)`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`// Run a long running idle task in a background container using the specified`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,4 @@ const (`
`7`	`7`	`isUnixCli = true`
`8`	`8`
`9`	`9`	`expectedFileChmod = "-rw-r--r--"`
`10`		`-`
`11`		- // On Unix variants, the busybox image comes with the `top` command which
`12`		`- // runs indefinitely while still being interruptible by a signal.`
`13`		`- defaultSleepImage = "busybox"`
`14`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,4 @@ const (`
`8`	`8`
`9`	`9`	`// this is the expected file permission set on windows: gh#11395`
`10`	`10`	`expectedFileChmod = "-rwxr-xr-x"`
`11`		`-`
`12`		- // On Windows, the busybox image doesn't have the `top` command, so we rely
`13`		- // on `sleep` with a high duration.
`14`		`- defaultSleepImage = "busybox"`
`15`	`11`	`)`