Skip to content

Commit 192c20a

Browse files
committed
tests: enable sync tests
1 parent c435d12 commit 192c20a

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

e2e/tests/sync/sync.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ var _ = DevSpaceDescribe("sync", func() {
3838
})
3939

4040
ginkgo.It("devspace sync should override permissions on initial sync", func() {
41-
ginkgo.Skip("permission not synced")
4241
tempDir, err := framework.CopyToTempDir("tests/sync/testdata/permissions")
4342
framework.ExpectNoError(err)
4443
defer framework.CleanupTempDir(initialDir, tempDir)
@@ -272,7 +271,6 @@ var _ = DevSpaceDescribe("sync", func() {
272271
})
273272

274273
ginkgo.It("should sync to a pod and watch changes", func() {
275-
ginkgo.Skip("error selecting container: couldn't find a pod / container with everything selector")
276274
tempDir, err := framework.CopyToTempDir("tests/sync/testdata/sync-simple")
277275
framework.ExpectNoError(err)
278276
defer framework.CleanupTempDir(initialDir, tempDir)
@@ -340,7 +338,6 @@ var _ = DevSpaceDescribe("sync", func() {
340338
})
341339

342340
ginkgo.It("should sync to a pod and not watch changes with --no-watch", func() {
343-
ginkgo.Skip("imageselector issue")
344341
tempDir, err := framework.CopyToTempDir("tests/sync/testdata/sync-simple")
345342
framework.ExpectNoError(err)
346343
defer framework.CleanupTempDir(initialDir, tempDir)
@@ -389,7 +386,6 @@ var _ = DevSpaceDescribe("sync", func() {
389386
})
390387

391388
ginkgo.It("should sync to a pod container with --container and --container-path", func() {
392-
ginkgo.Skip("error selecting container: couldn't find a pod / container with everything selector")
393389
tempDir, err := framework.CopyToTempDir("tests/sync/testdata/sync-containers")
394390
framework.ExpectNoError(err)
395391
defer framework.CleanupTempDir(initialDir, tempDir)
@@ -454,7 +450,6 @@ var _ = DevSpaceDescribe("sync", func() {
454450
})
455451

456452
ginkgo.It("should sync to a pod container with excludeFile, downloadExcludeFile, and uploadExcludeFile configuration", func() {
457-
ginkgo.Skip("todo")
458453
tempDir, err := framework.CopyToTempDir("tests/sync/testdata/sync-exclude-file")
459454
framework.ExpectNoError(err)
460455
defer framework.CleanupTempDir(initialDir, tempDir)
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
package testing
22

33
import (
4-
"github.com/loft-sh/devspace/pkg/devspace/config/localcache"
5-
"github.com/loft-sh/devspace/pkg/util/log"
4+
devspacecontext "github.com/loft-sh/devspace/pkg/devspace/context"
65
)
76

87
// Builder is a fake implementation of the Interface interface
98
type Builder struct {
109
}
1110

1211
// ShouldRebuild is a fake implementation of the function
13-
func (b *Builder) ShouldRebuild(cache *localcache.CacheConfig, forceRebuild, ignoreContextPathChanges bool) (bool, error) {
12+
func (b *Builder) ShouldRebuild(ctx *devspacecontext.Context, forceRebuild bool) (bool, error) {
1413
return forceRebuild, nil
1514
}
1615

1716
// Build is a fake implementation of the function
18-
func (b *Builder) Build(log log.Logger) error {
17+
func (b *Builder) Build(ctx *devspacecontext.Context) error {
1918
return nil
2019
}

pkg/devspace/config/versions/v1beta11/upgrade.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
191191
if image.Build != nil && image.Build.BuildKit != nil && image.Build.BuildKit.SkipPush {
192192
nextConfig.Images[imageName].SkipPush = true
193193
}
194-
if image.Build.Docker != nil {
194+
if image.Build != nil && image.Build.Docker != nil {
195195
nextConfig.Images[imageName].Docker = &next.DockerConfig{
196196
PreferMinikube: image.Build.Docker.PreferMinikube,
197197
DisableFallback: image.Build.Docker.DisableFallback,
@@ -200,7 +200,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
200200
Args: image.Build.Docker.Args,
201201
}
202202
}
203-
if image.Build.BuildKit != nil {
203+
if image.Build != nil && image.Build.BuildKit != nil {
204204
nextConfig.Images[imageName].BuildKit = &next.BuildKitConfig{
205205
PreferMinikube: image.Build.BuildKit.PreferMinikube,
206206
Args: image.Build.BuildKit.Args,
@@ -220,7 +220,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
220220
}
221221
}
222222
}
223-
if image.Build.Custom != nil {
223+
if image.Build != nil && image.Build.Custom != nil {
224224
nextConfig.Images[imageName].Custom = &next.CustomConfig{
225225
Command: image.Build.Custom.Command,
226226
OnChange: image.Build.Custom.OnChange,
@@ -241,7 +241,7 @@ func (c *Config) Upgrade(log log.Logger) (config.Config, error) {
241241
})
242242
}
243243
}
244-
if image.Build.Kaniko != nil {
244+
if image.Build != nil && image.Build.Kaniko != nil {
245245
nextConfig.Images[imageName].Kaniko = &next.KanikoConfig{
246246
SnapshotMode: image.Build.Kaniko.SnapshotMode,
247247
Image: image.Build.Kaniko.Image,

0 commit comments

Comments
 (0)