fix: try to resolve test flaking

Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>
devspace-sh · Dec 1, 2023 · fefb7d0 · fefb7d0
1 parent 3ddb499
commit fefb7d0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/e2e/tests/pipelines/pipelines.go b/e2e/tests/pipelines/pipelines.go
@@ -417,24 +417,19 @@ var _ = DevSpaceDescribe("pipelines", func() {
 		err = devCmd.RunDefault(f)
 		framework.ExpectNoError(err)
 	})
-})
-
-var _ = DevSpaceDescribe("pipelines_without_kubeconfig", func() {
-	initialDir, err := os.Getwd()
-	if err != nil {
-		panic(err)
-	}
 
-	// create a new factory
-	var (
-		f factory.Factory
-	)
 	ginkgo.It("should not panic on inalid kubeconfig", func() {
-		f = framework.NewDefaultFactory()
 		tempDir, err := framework.CopyToTempDir("tests/pipelines/testdata/invalid_kubeconfig")
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
 
+		origEnv := os.Getenv("KUBE_CONFIG")
+		defer os.Setenv("KUBE_CONFIG", origEnv)
+
+		os.Setenv("KUBE_CONFIG", "nonexistent.yaml")
+		newEnv := os.Getenv("KUBE_CONFIG")
+		framework.ExpectEqual(newEnv, "nonexistent.yaml")
+
 		devCmd := &cmd.RunPipelineCmd{
 			GlobalFlags: &flags.GlobalFlags{
 				NoWarn: true,

diff --git a/e2e/tests/ssh/ssh.go b/e2e/tests/ssh/ssh.go
@@ -84,7 +84,7 @@ var _ = DevSpaceDescribe("ssh", func() {
 		framework.ExpectNoError(err)
 		ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
 
-		ns, err := kubeClient.CreateNamespace("ssh")
+		ns, err := kubeClient.CreateNamespace("ssh-without-service")
 		framework.ExpectNoError(err)
 		ginkgo.DeferCleanup(framework.ExpectDeleteNamespace, kubeClient, ns)
 
@@ -137,7 +137,7 @@ var _ = DevSpaceDescribe("ssh", func() {
 		framework.ExpectNoError(err)
 		ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
 
-		ns, err := kubeClient.CreateNamespace("ssh")
+		ns, err := kubeClient.CreateNamespace("ssh-with-service")
 		framework.ExpectNoError(err)
 		ginkgo.DeferCleanup(framework.ExpectDeleteNamespace, kubeClient, ns)