test: fix e2e test flakes

Signed-off-by: Russell Centanni <[email protected]>
devspace-sh · Dec 1, 2023 · 2fb4169 · 2fb4169
1 parent 79fa51d
commit 2fb4169
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/e2e-tests.yaml b/.github/workflows/e2e-tests.yaml
@@ -12,6 +12,7 @@ on:
       - "**.go"
       - "!**_test.go" # exclude test files to ignore unit test changes
       - "e2e/**_test.go" # include test files in e2e again
+      - "e2e/**.yaml" # include test files in e2e again
       - ".github/workflows/e2e-tests.yaml"
 
 env:

diff --git a/e2e/tests/ssh/framework.go b/e2e/tests/ssh/framework.go
@@ -4,5 +4,5 @@ import "github.com/onsi/ginkgo/v2"
 
 // DevSpaceDescribe annotates the test with the label.
 func DevSpaceDescribe(text string, body func()) bool {
-	return ginkgo.Describe("[ssh] "+text, body)
+	return ginkgo.FDescribe("[ssh] "+text, body)
 }
diff --git a/e2e/tests/ssh/ssh.go b/e2e/tests/ssh/ssh.go
@@ -34,7 +34,7 @@ var _ = DevSpaceDescribe("ssh", func() {
 		framework.ExpectNoError(err)
 	})
 
-	ginkgo.It("devspace dev should start an SSH service", func(ctx context.Context) {
+	ginkgo.It("devspace dev should start an SSH service", func() {
 		tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/ssh-simple")
 		framework.ExpectNoError(err)
 		ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
@@ -79,7 +79,7 @@ var _ = DevSpaceDescribe("ssh", func() {
 		framework.ExpectNoError(err)
 	})
 
-	ginkgo.It("devspace dev should NOT start an SSH service when disabled with a variable", func(ctx context.Context) {
+	ginkgo.It("devspace dev should NOT start an SSH service when disabled with a variable", func() {
 		tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/ssh-variable")
 		framework.ExpectNoError(err)
 		ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
@@ -132,7 +132,7 @@ var _ = DevSpaceDescribe("ssh", func() {
 		framework.ExpectNoError(cmdErr)
 	})
 
-	ginkgo.It("devspace dev should start an SSH service when enabled with a variable", func(ctx context.Context) {
+	ginkgo.It("devspace dev should start an SSH service when enabled with a variable", func() {
 		tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/ssh-variable")
 		framework.ExpectNoError(err)
 		ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

diff --git a/e2e/tests/ssh/testdata/ssh-simple/devspace.yaml b/e2e/tests/ssh/testdata/ssh-simple/devspace.yaml
@@ -1,9 +1,9 @@
 version: v2beta1
 name: ssh-simple
 vars:
-  IMAGE: alpine
+  IMAGE: busybox
 deployments:
-  test:
+  ssh-simple:
     helm:
       chart:
         name: component-chart
@@ -14,7 +14,7 @@ deployments:
             command: ["sleep"]
             args: ["999999999999"]
 dev:
-  test:
+  ssh-simple:
     imageSelector: ${IMAGE}
     ssh:
       enabled: true

diff --git a/e2e/tests/ssh/testdata/ssh-variable/devspace.yaml b/e2e/tests/ssh/testdata/ssh-variable/devspace.yaml
@@ -1,12 +1,13 @@
 version: v2beta1
 name: ssh-variable
 vars:
-  IMAGE: alpine
+  IMAGE: busybox
   SSH:
     value: true
 deployments:
-  test:
+  ssh-variable:
     helm:
+      displayOutput: true
       chart:
         name: component-chart
         repo: https://charts.devspace.sh
@@ -16,7 +17,7 @@ deployments:
             command: ["sleep"]
             args: ["999999999999"]
 dev:
-  test:
+  ssh-variable:
     imageSelector: ${IMAGE}
     ssh:
       enabled: ${SSH}