Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: fix e2e test flakes #2764

Closed
wants to merge 2 commits into from
Closed

test: fix e2e test flakes #2764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78e0142
test: fix e2e test flakes
lizardruss Dec 1, 2023
6ba88b6
Merge branch 'main' into fix-e2e-tests
lizardruss Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/e2e-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions e2e/tests/ssh/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions e2e/tests/ssh/testdata/ssh-simple/devspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: v2beta1
name: ssh-simple
vars:
IMAGE: alpine
IMAGE: busybox
deployments:
test:
ssh-simple:
helm:
chart:
name: component-chart
Expand All @@ -14,7 +14,7 @@ deployments:
command: ["sleep"]
args: ["999999999999"]
dev:
test:
ssh-simple:
imageSelector: ${IMAGE}
ssh:
enabled: true
Expand Down
7 changes: 4 additions & 3 deletions e2e/tests/ssh/testdata/ssh-variable/devspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,7 +17,7 @@ deployments:
command: ["sleep"]
args: ["999999999999"]
dev:
test:
ssh-variable:
imageSelector: ${IMAGE}
ssh:
enabled: ${SSH}
Expand Down
Loading