InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use testEnv methods and remove most of the global variables

Browse Source 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester
2017-01-13 17:23:28 +01:00
parent a7c3389a82
commit c8016e669f
40 changed files with 180 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
integration-cli/docker_cli_rmi_test.go
View File

@@ -67,7 +67,7 @@ func (s *DockerSuite) TestRmiImgIDMultipleTag(c *check.C) {
// Wait for it to exit as cannot commit a running container on Windows, and
// it will take a few seconds to exit
if daemonPlatform == "windows" {
if testEnv.DaemonPlatform() == "windows" {
err := waitExited(containerID, 60*time.Second)
c.Assert(err, check.IsNil)
}
@@ -111,7 +111,7 @@ func (s *DockerSuite) TestRmiImgIDForce(c *check.C) {
// Wait for it to exit as cannot commit a running container on Windows, and
// it will take a few seconds to exit
if daemonPlatform == "windows" {
if testEnv.DaemonPlatform() == "windows" {
err := waitExited(containerID, 60*time.Second)
c.Assert(err, check.IsNil)
}