Browse code

Merge pull request #31791 from Microsoft/jjh/unpause

CI cleanup - only unpause if platform supports it

Vincent Demeester authored on 2017/03/14 18:58:06
Showing 1 changed files
... ...
@@ -25,7 +25,9 @@ type logT interface {
25 25
 // and removing everything else. It's meant to run after any tests so that they don't
26 26
 // depend on each others.
27 27
 func (e *Execution) Clean(t testingT, dockerBinary string) {
28
-	unpauseAllContainers(t, dockerBinary)
28
+	if (e.DaemonPlatform() != "windows") || (e.DaemonPlatform() == "windows" && e.Isolation() == "hyperv") {
29
+		unpauseAllContainers(t, dockerBinary)
30
+	}
29 31
 	deleteAllContainers(t, dockerBinary)
30 32
 	deleteAllImages(t, dockerBinary, e.protectedElements.images)
31 33
 	deleteAllVolumes(t, dockerBinary)