Make test env restoration only when needed (#118)

Author: josvazg

test/e2e/kubernetes_test.go

@@ -24,13 +24,15 @@ import (
 )
 
 func TestMain(m *testing.M) {
+	runner := m.Run
 	if isQASelected() {
-		setQACredentialsEnvVars()
-		setQAProject()
+		runner = func() int {
+			setQACredentialsEnvVars()
+			defer restoreEnvVars()
+			return m.Run()
+		}
 	}
-	exitVal := m.Run()
-	restoreEnvVars()
-	os.Exit(exitVal)
+	os.Exit(runner())
 }
 
 func TestEnv(t *testing.T) {
@@ -90,7 +92,3 @@ func restoreEnv(envvar string) {
 func savedEnvVar(envvar string) string {
 	return fmt.Sprintf("%s_SAVED", envvar)
 }
-
-func setQAProject() {
-
-}