Skip to content

Commit 2ab1432

Browse files
committed
update tests
1 parent 52cb725 commit 2ab1432

File tree

10 files changed

+3805
-3793
lines changed

10 files changed

+3805
-3793
lines changed

e2e/tests/config/config.go

Lines changed: 1887 additions & 1879 deletions
Large diffs are not rendered by default.

e2e/tests/dependencies/dependencies.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package dependencies
22

33
import (
44
"context"
5+
"fmt"
56
"os"
67
"path/filepath"
78
"time"
@@ -40,7 +41,7 @@ var _ = DevSpaceDescribe("dependencies", func() {
4041
})
4142

4243
ginkgo.It("should skip equal dependencies", func() {
43-
ginkgo.Skip("Troubleshoot: Failed to deploy dep3 dependency.")
44+
ginkgo.Skip("couldn't find pipeline")
4445
tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/overlapping")
4546
framework.ExpectNoError(err)
4647
defer framework.CleanupTempDir(initialDir, tempDir)
@@ -87,10 +88,11 @@ var _ = DevSpaceDescribe("dependencies", func() {
8788
// check if dependencies were loaded correctly
8889
framework.ExpectEqual(len(dependencies), 1)
8990
framework.ExpectEqual(dependencies[0].Name(), "flat2")
90-
framework.ExpectEqual(config.Path(), "devspace.yaml")
91+
framework.ExpectEqual(config.Path(), filepath.Join(tempDir, "devspace.yaml"))
9192
})
9293

9394
ginkgo.It("should resolve dependencies with dev configuration and hooks", func() {
95+
ginkgo.Skip("dependencies[*].dev.replacePods,dependencies[*].dev.sync and dependencies[*].dev.ports is not supported anymore in v6")
9496
tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/dev-sync")
9597
framework.ExpectNoError(err)
9698
defer framework.CleanupTempDir(initialDir, tempDir)
@@ -157,7 +159,7 @@ var _ = DevSpaceDescribe("dependencies", func() {
157159
framework.ExpectEqual(len(dependencies), 1)
158160
framework.ExpectEqual(dependencies[0].Name(), "nested")
159161
framework.ExpectEqual(len(dependencies[0].Config().Config().Deployments), 2)
160-
framework.ExpectEqual(config.Path(), "activated.yaml")
162+
framework.ExpectEqual(config.Path(), filepath.Join(tempDir, "activated.yaml"))
161163
})
162164

163165
ginkgo.It("should resolve dependencies and deactivate activated dependency profiles with --disable-profile-activation", func() {
@@ -202,11 +204,12 @@ var _ = DevSpaceDescribe("dependencies", func() {
202204
defer framework.CleanupTempDir(initialDir, tempDir)
203205

204206
_, _, err = framework.LoadConfig(f, kubeClient.Client(), filepath.Join(tempDir, "validate-error.yaml"))
205-
framework.ExpectErrorMatch(err, "dependencies[0].profiles and dependencies[0].profile & dependencies[0].profileParents cannot be used together")
207+
framework.ExpectErrorMatch(err, "dependencies[nested].profiles and dependencies[nested].profile & dependencies[nested].profileParents cannot be used together")
206208
})
207209

208210
ginkgo.It("should resolve dependencies with dependencies.dev.replacePods", func() {
209-
ginkgo.Skip("Troubleshoot: Back-off pulling image username/app")
211+
ginkgo.Skip(" couldn't find pipeline")
212+
fmt.Println("dependencies[*].dev.replacePods,dependencies[*].dev.sync and dependencies[*].dev.ports is not supported anymore in v6")
210213
tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/dev-replacepods")
211214
framework.ExpectNoError(err)
212215
defer framework.CleanupTempDir(initialDir, tempDir)
@@ -281,6 +284,7 @@ var _ = DevSpaceDescribe("dependencies", func() {
281284
})
282285

283286
ginkgo.It("should resolve cyclic dependencies", func() {
287+
ginkgo.Skip(" dependencies[*].dev.replacePods,dependencies[*].dev.sync and dependencies[*].dev.ports is not supported anymore in v6")
284288
tempDir, err := framework.CopyToTempDir("tests/dependencies/testdata/cyclic")
285289
framework.ExpectNoError(err)
286290
defer framework.CleanupTempDir(initialDir, tempDir)

0 commit comments

Comments
 (0)