More merge conflicts.

test/integration/functional_test.go

@@ -42,6 +42,6 @@ func TestFunctional(t *testing.T) {
 		t.Run("EnvVars", testClusterEnv)
 		t.Run("SSH", testClusterSSH)
 		t.Run("IngressController", testIngressController)
-		// t.Run("Mounting", testMounting)
+		t.Run("Mounting", testMounting)
 	}
 }

test/integration/mount_test.go

@@ -79,7 +79,6 @@ func testMounting(t *testing.T) {
 	defer func() {
 		if out, err := kubectlRunner.RunCommand([]string{"delete", "-f", podPath}); err != nil {
 			t.Logf("delete -f %s failed: %v\noutput: %s\n", podPath, err, out)
-
 		}
 	}()
 

test/integration/pv_test.go

@@ -41,9 +41,12 @@ var (
 func testProvisioning(t *testing.T) {
 	t.Parallel()
 	kubectlRunner := util.NewKubectlRunner(t)
-	if out, err := kubectlRunner.RunCommand([]string{"delete", "pvc", pvcName}); err != nil {
-		t.Logf("delete pvc %s failed: %v\noutput: %s\n", pvcName, err, out)
-	}
+
+	defer func() {
+		if out, err := kubectlRunner.RunCommand([]string{"delete", "pvc", pvcName}); err != nil {
+			t.Logf("delete pvc %s failed: %v\noutput: %s\n", pvcName, err, out)
+		}
+	}()
 
 	// We have to make sure the addon-manager has created the StorageClass before creating
 	// a claim. Otherwise it will never get bound.
@@ -53,6 +56,7 @@ func testProvisioning(t *testing.T) {
 		if err := kubectlRunner.RunCommandParseOutput([]string{"get", "storageclass"}, &scl); err != nil {
 			return fmt.Errorf("get storageclass: %v", err)
 		}
+
 		if len(scl.Items) > 0 {
 			return nil
 		}