e2e: move cleanup actions to Scenario After hook

Author: Jakub Sliacan

test/e2e/features/basic.feature

@@ -57,8 +57,6 @@ Feature: Basic test
         And ensuring user is logged in succeeds
         And executing "oc get pods -n openshift-monitoring" succeeds
         Then stdout matches ".*cluster-monitoring-operator-\w+-\w+\ *2/2\ *Running.*"
-        And unsetting config property "enable-cluster-monitoring" succeeds
-        And unsetting config property "memory" succeeds
         # stop
         When executing "crc stop"
         Then stdout should match "(.*)[Ss]topped the instance"

test/e2e/testsuite/testsuite.go

@@ -235,6 +235,18 @@ func InitializeScenario(s *godog.ScenarioContext) {
 					fmt.Println(err)
 					os.Exit(1)
 				}
+
+				err = crcCmd.UnsetConfigPropertySucceedsOrFails("enable-cluster-monitoring", "succeeds") // unsetting property that is not set gives 0 exitcode, so this works
+				if err != nil {
+					fmt.Println(err)
+					os.Exit(1)
+				}
+
+				err = crcCmd.UnsetConfigPropertySucceedsOrFails("memory", "succeeds") // unsetting property that is not set gives 0 exitcode, so this works
+				if err != nil {
+					fmt.Println(err)
+					os.Exit(1)
+				}
 			}
 
 		}