chore: refactor e2e tests

openshift · Sep 14, 2023 · 6ada878 · 6ada878
1 parent 1068f03
commit 6ada878
Show file tree

Hide file tree

Showing 31 changed files with 744 additions and 1,523 deletions.
diff --git a/controllers/lvmcluster_controller.go b/controllers/lvmcluster_controller.go
@@ -155,10 +155,10 @@ func (r *LVMClusterReconciler) reconcile(ctx context.Context, instance *lvmv1alp
 		}
 		if lvsExist {
 			waitForLVRemoval := time.Second * 10
-			err := fmt.Errorf("found PVCs provisioned by topolvm, waiting %s for their deletion: %w", waitForLVRemoval, err)
+			err := fmt.Errorf("found PVCs provisioned by topolvm, waiting %s for their deletion", waitForLVRemoval)
 			r.WarningEvent(ctx, instance, EventReasonErrorDeletionPending, err)
 			// check every 10 seconds if there are still PVCs present
-			return ctrl.Result{RequeueAfter: waitForLVRemoval}, err
+			return ctrl.Result{RequeueAfter: waitForLVRemoval}, nil
 		}
 
 		logger.Info("processing LVMCluster deletion")

diff --git a/test/e2e/aws_disk.go → test/e2e/aws_disk_test.go b/test/e2e/aws_disk.go → test/e2e/aws_disk_test.go
diff --git a/test/e2e/config.go → test/e2e/config_test.go b/test/e2e/config.go → test/e2e/config_test.go
diff --git a/test/e2e/disk_setup.go → test/e2e/disk_setup_test.go b/test/e2e/disk_setup.go → test/e2e/disk_setup_test.go
diff --git a/test/e2e/ephemeral_check.go b/test/e2e/ephemeral_check.go