From 24f741f418ea2bfcf36f14bbf1b659206dc9987a Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sat, 17 Oct 2026 18:38:00 -0600 Subject: [PATCH] refactor(e2e): add CopyTestdata fixture helper --- e2e/framework/workspace.go | 10 ++ e2e/tests/build/build.go | 55 ++++------ e2e/tests/provider/provider.go | 53 ++++------ e2e/tests/rename/rename.go | 20 +--- e2e/tests/snapshot/snapshot.go | 32 ++---- e2e/tests/up-features/up_features.go | 151 +++++++++++---------------- 6 files changed, 126 insertions(+), 195 deletions(-) diff --git a/e2e/framework/workspace.go b/e2e/framework/workspace.go index f23addeb81..21b5fc8415 100644 --- a/e2e/framework/workspace.go +++ b/e2e/framework/workspace.go @@ -25,6 +25,16 @@ func SetupDockerWorkspace(testdataPath, initialDir string) (string, *Framework, return tempDir, f, nil } +// CopyTestdata copies testdataPath to a temp dir, changes into it, and registers +// cleanup that removes the temp dir and changes back to initialDir. +func CopyTestdata(testdataPath, initialDir string) string { + tempDir, err := CopyToTempDir(testdataPath) + ExpectNoErrorWithOffset(1, err) + ginkgo.DeferCleanup(CleanupTempDir, initialDir, tempDir) + + return tempDir +} + // SetupDockerWorkspaceAndUp is SetupDockerWorkspace followed by devsy up. func SetupDockerWorkspaceAndUp( ctx context.Context, diff --git a/e2e/tests/build/build.go b/e2e/tests/build/build.go index 076b865069..217072baa6 100644 --- a/e2e/tests/build/build.go +++ b/e2e/tests/build/build.go @@ -73,12 +73,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo. ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/build/testdata/docker", initialDir) _ = f.DevsyProviderDelete(ctx, "docker") - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) @@ -147,12 +145,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo. ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/build/testdata/docker", initialDir) _ = f.DevsyProviderDelete(ctx, "docker") - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) @@ -198,12 +194,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo. ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker-compose") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/build/testdata/docker-compose", initialDir) _ = f.DevsyProviderDelete(ctx, "docker") - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) @@ -226,14 +220,13 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo. // This fixture uses a local no-op feature so it exercises feature // installation without depending on distro package mirrors. Package // upgrades are unrelated to the compose build-context behavior here. - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/build/testdata/docker-compose-features-context", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) _ = f.DevsyProviderDelete(ctx, "docker") - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) @@ -249,12 +242,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo. ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/build/testdata/docker", initialDir) _ = f.DevsyProviderDelete(ctx, "docker") - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) @@ -275,12 +266,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo. ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/build/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/build/testdata/docker", initialDir) _ = f.DevsyProviderDelete(ctx, "docker") - err = f.DevsyProviderAdd(ctx, "docker") + err := f.DevsyProviderAdd(ctx, "docker") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) @@ -336,12 +325,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo. } f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/build/testdata/kubernetes") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/build/testdata/kubernetes", initialDir) _ = f.DevsyProviderDelete(ctx, "kubernetes") - err = f.DevsyProviderAdd(ctx, "kubernetes") + err := f.DevsyProviderAdd(ctx, "kubernetes") framework.ExpectNoError(err) err = f.DevsyProviderUse( ctx, @@ -396,12 +383,10 @@ var _ = ginkgo.Describe("devsy build test suite", ginkgo.Label("build"), ginkgo. } f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/build/testdata/kubernetes") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/build/testdata/kubernetes", initialDir) _ = f.DevsyProviderDelete(ctx, "kubernetes") - err = f.DevsyProviderAdd(ctx, "kubernetes") + err := f.DevsyProviderAdd(ctx, "kubernetes") framework.ExpectNoError(err) err = f.DevsyProviderUse(ctx, "kubernetes", "-o", "KUBERNETES_NAMESPACE=devsy") framework.ExpectNoError(err) @@ -441,12 +426,10 @@ func validateKubernetesDeploymentWithoutDocker( } f := framework.NewDefaultFramework(initialDir + "/bin") - tempDir, err := framework.CopyToTempDir("tests/build/testdata/kubernetes") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/build/testdata/kubernetes", initialDir) _ = f.DevsyProviderDelete(ctx, "kubernetes") - err = f.DevsyProviderAdd(ctx, "kubernetes") + err := f.DevsyProviderAdd(ctx, "kubernetes") framework.ExpectNoError(err) err = f.DevsyProviderUse( ctx, diff --git a/e2e/tests/provider/provider.go b/e2e/tests/provider/provider.go index 7a89066cc6..cf302cddb0 100644 --- a/e2e/tests/provider/provider.go +++ b/e2e/tests/provider/provider.go @@ -28,15 +28,14 @@ var _ = ginkgo.Describe( ginkgo.It("should add simple provider and delete it", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/provider/testdata/simple-k8s-provider", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) f := framework.NewDefaultFramework(initialDir + "/bin") - err = f.DevsyProviderDelete(ctx, "provider1", "--ignore-not-found") + err := f.DevsyProviderDelete(ctx, "provider1", "--ignore-not-found") framework.ExpectNoError(err) err = f.DevsyProviderAdd(ctx, tempDir+"/provider1.yaml") @@ -57,15 +56,14 @@ var _ = ginkgo.Describe( ginkgo.It("should add simple provider and update it", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/provider/testdata/simple-k8s-provider", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) f := framework.NewDefaultFramework(initialDir + "/bin") - err = f.DevsyProviderDelete(ctx, "provider2", "--ignore-not-found") + err := f.DevsyProviderDelete(ctx, "provider2", "--ignore-not-found") framework.ExpectNoError(err) err = f.DevsyProviderAdd(ctx, tempDir+"/provider2.yaml") @@ -114,15 +112,14 @@ var _ = ginkgo.Describe( ginkgo.It("should list all providers", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/provider/testdata/simple-k8s-provider", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) f := framework.NewDefaultFramework(initialDir + "/bin") - err = f.DevsyProviderDelete(ctx, "provider1", "--ignore-not-found") + err := f.DevsyProviderDelete(ctx, "provider1", "--ignore-not-found") framework.ExpectNoError(err) err = f.DevsyProviderAdd(ctx, tempDir+"/provider1.yaml") @@ -147,15 +144,14 @@ var _ = ginkgo.Describe( ginkgo.It("should parse options", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/provider/testdata/simple-k8s-provider", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) f := framework.NewDefaultFramework(initialDir + "/bin") - err = f.DevsyProviderDelete(ctx, "provider3", "--ignore-not-found") + err := f.DevsyProviderDelete(ctx, "provider3", "--ignore-not-found") framework.ExpectNoError(err) podManifest := ` @@ -191,11 +187,10 @@ spec: ginkgo.It("should rename a provider to a new, valid name", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/provider/testdata/simple-k8s-provider", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) f := framework.NewDefaultFramework(initialDir + "/bin") @@ -203,7 +198,7 @@ spec: renamedProviderName := "provider-renamed" // Ensure that provider is deleted. - err = f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found") + err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found") framework.ExpectNoError(err) err = f.DevsyProviderDelete(ctx, renamedProviderName, "--ignore-not-found") framework.ExpectNoError(err) @@ -232,18 +227,17 @@ spec: "should fail to rename a provider to a name that already exists", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/provider/testdata/simple-k8s-provider", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) f := framework.NewDefaultFramework(initialDir + "/bin") providerToRename := "provider-to-rename2" existingProvider := "existing-provider2" - err = f.DevsyProviderDelete(ctx, providerToRename, "--ignore-not-found") + err := f.DevsyProviderDelete(ctx, providerToRename, "--ignore-not-found") framework.ExpectNoError(err) err = f.DevsyProviderDelete(ctx, existingProvider, "--ignore-not-found") framework.ExpectNoError(err) @@ -323,9 +317,7 @@ spec: err = f.DevsyProviderDelete(ctx, renamedProviderName, "--ignore-not-found") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir) err = f.DevsyProviderAddDocker(ctx, providerName) framework.ExpectNoError(err) @@ -380,17 +372,16 @@ spec: ginkgo.It("should fail to rename a provider to an invalid name", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/provider/testdata/simple-k8s-provider", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) f := framework.NewDefaultFramework(initialDir + "/bin") providerName := "provider-to-rename-invalid6" - err = f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found") + err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found") framework.ExpectNoError(err) err = f.DevsyProviderAdd(ctx, tempDir+"/provider1.yaml", "--name", providerName) diff --git a/e2e/tests/rename/rename.go b/e2e/tests/rename/rename.go index a29168de65..a8a0722dcf 100644 --- a/e2e/tests/rename/rename.go +++ b/e2e/tests/rename/rename.go @@ -37,9 +37,7 @@ var _ = ginkgo.Describe( err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir) err = f.DevsyProviderAddDocker(ctx, providerName) framework.ExpectNoError(err) @@ -116,9 +114,7 @@ var _ = ginkgo.Describe( err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir) err = f.DevsyProviderAddDocker(ctx, providerName) framework.ExpectNoError(err) @@ -175,9 +171,7 @@ var _ = ginkgo.Describe( err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir) err = f.DevsyProviderAddDocker(ctx, providerName) framework.ExpectNoError(err) @@ -233,9 +227,7 @@ var _ = ginkgo.Describe( err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir) err = f.DevsyProviderAddDocker(ctx, providerName) framework.ExpectNoError(err) @@ -279,9 +271,7 @@ var _ = ginkgo.Describe( err := f.DevsyProviderDelete(ctx, providerName, "--ignore-not-found") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", initialDir) err = f.DevsyProviderAddDocker(ctx, providerName) framework.ExpectNoError(err) diff --git a/e2e/tests/snapshot/snapshot.go b/e2e/tests/snapshot/snapshot.go index e05c81696c..6113952b90 100644 --- a/e2e/tests/snapshot/snapshot.go +++ b/e2e/tests/snapshot/snapshot.go @@ -57,9 +57,7 @@ var _ = ginkgo.Describe("devsy snapshot", ginkgo.Label("snapshot"), func() { initialDir, err := os.Getwd() framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/snapshot/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/snapshot/testdata/docker", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(f.DevsyUp(ctx, tempDir)) @@ -113,9 +111,7 @@ var _ = ginkgo.Describe("devsy snapshot", ginkgo.Label("snapshot"), func() { initialDir, err := os.Getwd() framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/snapshot/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/snapshot/testdata/docker", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(f.DevsyUp(ctx, tempDir)) @@ -204,9 +200,7 @@ var _ = ginkgo.Describe("devsy snapshot", ginkgo.Label("snapshot"), func() { initialDir, err := os.Getwd() framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/snapshot/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/snapshot/testdata/docker", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(f.DevsyUp(ctx, tempDir)) @@ -239,9 +233,7 @@ var _ = ginkgo.Describe("devsy snapshot", ginkgo.Label("snapshot"), func() { initialDir, err := os.Getwd() framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/snapshot/testdata/docker-multi-mount") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/snapshot/testdata/docker-multi-mount", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(f.DevsyUp(ctx, tempDir)) @@ -266,9 +258,7 @@ var _ = ginkgo.Describe("devsy snapshot", ginkgo.Label("snapshot"), func() { initialDir, err := os.Getwd() framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/snapshot/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/snapshot/testdata/docker", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(f.DevsyUp(ctx, tempDir)) @@ -336,9 +326,7 @@ var _ = ginkgo.Describe("devsy snapshot", ginkgo.Label("snapshot"), func() { initialDir, err := os.Getwd() framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/snapshot/testdata/docker") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/snapshot/testdata/docker", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(f.DevsyUp(ctx, tempDir)) @@ -403,9 +391,7 @@ var _ = ginkgo.Describe("devsy snapshot", ginkgo.Label("snapshot"), func() { initialDir, err := os.Getwd() framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/snapshot/testdata/docker-runargs") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/snapshot/testdata/docker-runargs", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(f.DevsyUp(ctx, tempDir)) @@ -444,9 +430,7 @@ var _ = ginkgo.Describe("devsy snapshot", ginkgo.Label("snapshot"), func() { initialDir, err := os.Getwd() framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/snapshot/testdata/docker-nonroot") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata("tests/snapshot/testdata/docker-nonroot", initialDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir) framework.ExpectNoError(f.DevsyUp(ctx, tempDir)) diff --git a/e2e/tests/up-features/up_features.go b/e2e/tests/up-features/up_features.go index 50fa609764..4c71df8e8e 100644 --- a/e2e/tests/up-features/up_features.go +++ b/e2e/tests/up-features/up_features.go @@ -34,9 +34,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir("tests/up-features/testdata/docker-features-hooks") - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) + tempDir := framework.CopyTestdata( + "tests/up-features/testdata/docker-features-hooks", + initialDir, + ) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -61,11 +62,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-hooks-order", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -86,18 +86,17 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( server := ghttp.NewServer() ginkgo.DeferCleanup(server.Close) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-http-headers", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) featureArchiveFilePath := path.Join(tempDir, "devcontainer-feature-hello.tgz") featureFiles := []string{ path.Join(tempDir, "devcontainer-feature.json"), path.Join(tempDir, "install.sh"), } - err = createTarGzArchive(featureArchiveFilePath, featureFiles) + err := createTarGzArchive(featureArchiveFilePath, featureFiles) framework.ExpectNoError(err) devContainerFileBuf, err := os.ReadFile(path.Join(tempDir, ".devcontainer.json")) @@ -143,21 +142,19 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( server := ghttp.NewServer() ginkgo.DeferCleanup(server.Close) - tempDir1, err := framework.CopyToTempDir( + tempDir1 := framework.CopyTestdata( "tests/up-features/testdata/docker-features-http-headers", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir1) // CopyToTempDir changes cwd; restore so the second copy resolves its relative path. - err = os.Chdir(initialDir) + err := os.Chdir(initialDir) framework.ExpectNoError(err) - tempDir2, err := framework.CopyToTempDir( + tempDir2 := framework.CopyTestdata( "tests/up-features/testdata/docker-features-http-headers", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir2) featureArchiveFilePath := path.Join(tempDir1, "devcontainer-feature-hello.tgz") featureFiles := []string{ @@ -235,11 +232,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-lifecycle-hooks", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -255,11 +251,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-depends-on", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -282,11 +277,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-depends-on-duplicate-feature", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -309,11 +303,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-nested-depends-on", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -336,11 +329,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-circular-depends-on", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -360,11 +352,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-depends-on-options", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -387,11 +378,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-mixed-dependencies", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -414,11 +404,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-self-dependency", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -437,11 +426,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-nonexistent-dependency", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -460,11 +448,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-shared-dependency", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -488,11 +475,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-forward-reference", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -514,11 +500,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-same-depends-on-and-installs-after", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -544,11 +529,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-lockfile", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -586,11 +570,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-lockfile", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -608,11 +591,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-lockfile", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -633,11 +615,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-lockfile-bad", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -655,11 +636,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( server := ghttp.NewServer() ginkgo.DeferCleanup(server.Close) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-http-headers", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) featureArchiveFilePath := path.Join(tempDir, "devcontainer-feature-hello.tgz") featureFiles := []string{ @@ -719,11 +699,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-with-user-variable-in-dockerfile", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -740,11 +719,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-with-user-variable", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -764,11 +742,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-legacy-id-resolution", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -791,11 +768,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-override-violates-depends-on", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -813,11 +789,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-valid-override", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -839,11 +814,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-different-versions", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName) @@ -869,11 +843,10 @@ var _ = ginkgo.Describe("testing up command", ginkgo.Label("up-features"), func( f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker") framework.ExpectNoError(err) - tempDir, err := framework.CopyToTempDir( + tempDir := framework.CopyTestdata( "tests/up-features/testdata/docker-features-secret-option", + initialDir, ) - framework.ExpectNoError(err) - ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir) wsName := filepath.Base(tempDir) ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, wsName)