fail if stop was not successful

Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>
jonathansp · Aug 6, 2021 · 8ec405e · 8ec405e
1 parent 3cad738
commit 8ec405e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/test/integration/framework/apiserver.go b/test/integration/framework/apiserver.go
@@ -54,17 +54,6 @@ func RunControlPlane(t *testing.T) (*rest.Config, StopFunc) {
 	}
 
 	webhookOpts, stopWebhook := webhooktesting.StartWebhookServer(t, []string{"--api-server-host=" + config.Host})
-	stopFn := func() {
-		defer stopWebhook()
-		stopControlPlane()
-	}
-
-	initialised := false
-	defer func() {
-		if !initialised {
-			stopFn()
-		}
-	}()
 
 	crdsDir := apitesting.CRDDirectory(t)
 	crds := readCustomResourcesAtPath(t, crdsDir)
@@ -97,8 +86,10 @@ func RunControlPlane(t *testing.T) (*rest.Config, StopFunc) {
 		t.Fatal(err)
 	}
 
-	initialised = true
-	return config, stopFn
+	return config, func() {
+		defer stopWebhook()
+		stopControlPlane()
+	}
 }
 
 var (

diff --git a/test/internal/apiserver/apiserver.go b/test/internal/apiserver/apiserver.go
@@ -44,7 +44,7 @@ func RunBareControlPlane(t *testing.T) (*envtest.Environment, StopFunc) {
 
 	return env, func() {
 		if err := env.Stop(); err != nil {
-			t.Logf("failed to shut down control plane, not failing test: %v", err)
+			t.Fatalf("failed to shut down control plane: %v", err)
 		}
 	}
 }