Selaa lähdekoodia

testutil/environment: rename var that collided with import

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 2 vuotta sitten
vanhempi
commit
0fe2ac0437
1 muutettua tiedostoa jossa 7 lisäystä ja 7 poistoa
  1. 7 7
      testutil/environment/clean.go

+ 7 - 7
testutil/environment/clean.go

@@ -19,18 +19,18 @@ import (
 // depend on each others.
 // depend on each others.
 func (e *Execution) Clean(t testing.TB) {
 func (e *Execution) Clean(t testing.TB) {
 	t.Helper()
 	t.Helper()
-	client := e.APIClient()
+	apiClient := e.APIClient()
 
 
 	platform := e.OSType
 	platform := e.OSType
 	if (platform != "windows") || (platform == "windows" && e.DaemonInfo.Isolation == "hyperv") {
 	if (platform != "windows") || (platform == "windows" && e.DaemonInfo.Isolation == "hyperv") {
-		unpauseAllContainers(t, client)
+		unpauseAllContainers(t, apiClient)
 	}
 	}
-	deleteAllContainers(t, client, e.protectedElements.containers)
-	deleteAllImages(t, client, e.protectedElements.images)
-	deleteAllVolumes(t, client, e.protectedElements.volumes)
-	deleteAllNetworks(t, client, platform, e.protectedElements.networks)
+	deleteAllContainers(t, apiClient, e.protectedElements.containers)
+	deleteAllImages(t, apiClient, e.protectedElements.images)
+	deleteAllVolumes(t, apiClient, e.protectedElements.volumes)
+	deleteAllNetworks(t, apiClient, platform, e.protectedElements.networks)
 	if platform == "linux" {
 	if platform == "linux" {
-		deleteAllPlugins(t, client, e.protectedElements.plugins)
+		deleteAllPlugins(t, apiClient, e.protectedElements.plugins)
 	}
 	}
 }
 }