Merge pull request #31791 from Microsoft/jjh/unpause

CI cleanup - only unpause if platform supports it
Upstream-commit: 6ea8006a4f4223d0a68dfd6befef30b25a90d71a
Component: engine
This commit is contained in:
Vincent Demeester
2017-03-14 10:58:06 +01:00
committed by GitHub
@@ -25,7 +25,9 @@ type logT interface {
// and removing everything else. It's meant to run after any tests so that they don't
// depend on each others.
func (e *Execution) Clean(t testingT, dockerBinary string) {
unpauseAllContainers(t, dockerBinary)
if (e.DaemonPlatform() != "windows") || (e.DaemonPlatform() == "windows" && e.Isolation() == "hyperv") {
unpauseAllContainers(t, dockerBinary)
}
deleteAllContainers(t, dockerBinary)
deleteAllImages(t, dockerBinary, e.protectedElements.images)
deleteAllVolumes(t, dockerBinary)