integration: refactor top-level testsuite info and actions

test/integration/testsuite_test.go

@@ -43,18 +43,29 @@ func TestTest(t *testing.T) {
 	}
 	reporterConfig.JUnitReport = filepath.Join("out", "integration.xml")
 
-	RunSpecs(t, "Test Suite", suiteConfig, reporterConfig)
+	RunSpecs(t, "Integration", suiteConfig, reporterConfig)
 
 }
 
 var _ = BeforeSuite(func() {
 
 	// set userHome
 	usr, err := user.Current()
+	Expect(err).NotTo(HaveOccurred())
+
+	userHome = usr.HomeDir
+
+	// cleanup CRC
+	Expect(RunCRCExpectSuccess("cleanup")).To(MatchRegexp("Cleanup finished"))
+
+	// remove config file
+	configFilePath := filepath.Join(userHome, ".crc", "crc.json")
+	err = os.RemoveAll(configFilePath)
 	if err != nil {
-		Expect(err).NotTo(HaveOccurred())
+		logrus.Infof("could not delete %s.", configFilePath)
+		logrus.Infof("%v", err)
 	}
-	userHome = usr.HomeDir
+	Expect(err).NotTo(HaveOccurred())
 
 	// set credPath
 	credPath = filepath.Join(userHome, ".crc", "machines", "crc", "id_rsa")
@@ -75,15 +86,15 @@ var _ = BeforeSuite(func() {
 
 		logrus.Infof("Error: Could not read GINKGO_OPTS.")
 		logrus.Infof("%v", err)
-		Expect(err).NotTo(HaveOccurred())
 	}
+	Expect(err).NotTo(HaveOccurred())
 
 	pullSecretPath = os.Getenv("PULL_SECRET_PATH") // this env var should contain location of pull-secret file
 	if err != nil {
 
 		logrus.Infof("Error: You need to set PULL_SECRET_PATH to find CRC useful.")
 		logrus.Infof("%v", err)
-		Expect(err).NotTo(HaveOccurred())
 	}
+	Expect(err).NotTo(HaveOccurred())
 
 })