Skip to content

Move TearDownTest cleaning to environment package#31460

Merged
thaJeztah merged 1 commit intomoby:masterfrom
vdemeester:integration-clean-in-env-p1
Mar 2, 2017
Merged

Move TearDownTest cleaning to environment package#31460
thaJeztah merged 1 commit intomoby:masterfrom
vdemeester:integration-clean-in-env-p1

Conversation

@vdemeester
Copy link
Copy Markdown
Member

Move the clean functions of integration-cli in the environment package (and mainly in testEnv.Clean(…) function).

It just move the function to the package with the smallest change possible 👼 . First part of #30759 which I'll close.

/cc @thaJeztah @tonistiigi @tiborvass @dnephin @icecrime @cpuguy83 @LK4D4

🐸

Signed-off-by: Vincent Demeester [email protected]

@vdemeester vdemeester force-pushed the integration-clean-in-env-p1 branch 2 times, most recently from 9b95057 to c3af862 Compare March 1, 2017 17:45
@vdemeester vdemeester added status/2-code-review status/failing-ci Indicates that the PR in its current state fails the test suite and removed status/0-triage labels Mar 1, 2017
@vdemeester vdemeester force-pushed the integration-clean-in-env-p1 branch from c3af862 to 2919902 Compare March 1, 2017 20:04
@vdemeester vdemeester force-pushed the integration-clean-in-env-p1 branch from 2919902 to 1858656 Compare March 1, 2017 20:04
@dnephin dnephin removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Mar 1, 2017
Copy link
Copy Markdown
Member

@dnephin dnephin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

return
}
protectedImages["syscall-test:latest"] = struct{}{}
defer testEnv.ProtectImage(c, "syscall-test:latest")
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not an issue, just currious about why this would be defered?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dnephin oh you are right. It was required to be defered in the previous PR because I was inspecting the image (and thus needed to wait for the image to be actually imported) — it's not the case anymore, yet 👼 .

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah merged commit 1a412a0 into moby:master Mar 2, 2017
@GordonTheTurtle GordonTheTurtle added this to the 17.04.0 milestone Mar 2, 2017
@vdemeester vdemeester deleted the integration-clean-in-env-p1 branch March 2, 2017 08:52
@vdemeester
Copy link
Copy Markdown
Member Author

💯 💯 💯 🎉

@thaJeztah
Copy link
Copy Markdown
Member

\o/!!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants