cleanup

Author: isabella-janssen

test/extended/machine_config/helpers.go

@@ -578,7 +578,7 @@ func WaitForMCNConditionStatus(clientSet *machineconfigclient.Clientset, mcnName
 			framework.Logf("An error occured waiting for MCN '%v' %v condition to be %v: %v", mcnName, conditionType, status, conditionErr)
 			return conditionMet, fmt.Errorf("MCN '%v' %v condition was not %v: %v", mcnName, conditionType, status, conditionErr)
 		} else {
-			framework.Logf("MCN '%v' %v condition was not %v: %v", mcnName, conditionType, status, conditionErr)
+			framework.Logf("MCN '%v' %v condition was not %v.", mcnName, conditionType, status)
 			return conditionMet, nil
 		}
 	}

test/extended/machine_config/machine_config_node.go

@@ -339,15 +339,6 @@ func validateTransitionThroughConditions(clientSet *machineconfigclient.Clientse
 		framework.Logf("Warning, could not detect UpdateExecuted=Unknown.")
 	}
 
-	// TEST CODE; TODO: REMOVE
-	framework.Logf("Waiting for Cordoned=True")
-	conditionMet, err = WaitForMCNConditionStatus(clientSet, updatingNodeName, mcfgv1alpha1.MachineConfigNodeUpdateCordoned, metav1.ConditionTrue, 5*time.Second, 1*time.Second)
-	o.Expect(err).NotTo(o.HaveOccurred(), fmt.Sprintf("Error occured while waiting for Cordoned=True: %v", err))
-	if !conditionMet {
-		framework.Logf("Warning, could not detect Cordoned=True.")
-	}
-	// TEST CODE; TODO: REMOVE
-
 	// On standard, non-rebootless, update, check that node transitions through "Cordoned" and "Drained" phases
 	if !isRebootless {
 		framework.Logf("Waiting for Cordoned=True")