Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions e2e/tests/ci/ci.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,7 @@ func setupCI(initialDir string) (string, *framework.Framework) {
}

func setupCIFrom(initialDir, testdataPath string) (string, *framework.Framework) {
tempDir, err := framework.CopyToTempDir(testdataPath)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata(testdataPath, initialDir)

f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker")
framework.ExpectNoError(err)
Expand Down
8 changes: 2 additions & 6 deletions e2e/tests/dockercontext/dockercontext.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ var _ = ginkgo.Describe(
err = exec.CommandContext(ctx, "docker", "context", "use", testContextName).Run()
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/up/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/docker", initialDir)
ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir)

stdout, stderr, err := f.DevsyUpStreams(ctx, tempDir)
Expand Down Expand Up @@ -141,9 +139,7 @@ var _ = ginkgo.Describe(
}
})

tempDir, err := framework.CopyToTempDir("tests/up/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/docker", initialDir)
ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir)

stdout, stderr, err := f.DevsyUpStreams(ctx, tempDir)
Expand Down
6 changes: 2 additions & 4 deletions e2e/tests/dockerinstall/dockerinstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,9 @@ var _ = ginkgo.Describe(
ginkgo.It("should install Docker when not present", func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")

tempDir, err := framework.CopyToTempDir("tests/up/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/docker", initialDir)

err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand Down
15 changes: 6 additions & 9 deletions e2e/tests/down/down.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ var _ = ginkgo.Describe(
f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/down/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/down/testdata/docker", initialDir)

err = f.DevsyUp(ctx, tempDir)
framework.ExpectNoError(err)
Expand Down Expand Up @@ -107,9 +105,7 @@ var _ = ginkgo.Describe(
f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/down/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/down/testdata/docker", initialDir)
ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir)

err = f.DevsyUp(ctx, tempDir)
Expand Down Expand Up @@ -147,9 +143,10 @@ var _ = ginkgo.Describe(
f, err := framework.SetupDockerProvider(initialDir+"/bin", "docker")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/down/testdata/docker-anon-volume")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata(
"tests/down/testdata/docker-anon-volume",
initialDir,
)

err = f.DevsyUp(ctx, tempDir)
framework.ExpectNoError(err)
Expand Down
4 changes: 1 addition & 3 deletions e2e/tests/extends-up/extends_up.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ var _ = ginkgo.Describe("extends up", ginkgo.Label("extends-up"), func() {
f, err := framework.SetupDockerProvider(filepath.Join(initialDir, "bin"), "docker")
framework.ExpectNoError(err)

tempDir, err := framework.CopyToTempDir("tests/extends-up/testdata/up-extends")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/extends-up/testdata/up-extends", initialDir)
ginkgo.DeferCleanup(f.DevsyWorkspaceDelete, tempDir)

err = f.DevsyUp(ctx, tempDir)
Expand Down
27 changes: 11 additions & 16 deletions e2e/tests/ide/browser_returns.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@ const gpgTestKeyFingerprint = "07F681B9FD6C3411F679BFD1F51769DB572DDD3F"
// the standard cleanup deferred to DeferCleanup.
func setupBrowserIDE(ctx context.Context, initialDir string) (*framework.Framework, string) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/ide/testdata")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/ide/testdata", initialDir)

err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand Down Expand Up @@ -276,11 +274,12 @@ var _ = ginkgo.Describe(
ginkgo.SpecTimeout(framework.TimeoutLong()),
func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/ide/testdata-codeserver-nonroot")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata(
"tests/ide/testdata-codeserver-nonroot",
initialDir,
)

err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand Down Expand Up @@ -316,11 +315,9 @@ var _ = ginkgo.Describe(
ginkgo.SpecTimeout(framework.TimeoutLong()),
func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/ide/testdata-gpg-nonroot")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/ide/testdata-gpg-nonroot", initialDir)

err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand Down Expand Up @@ -376,12 +373,10 @@ var _ = ginkgo.Describe(
ginkgo.SpecTimeout(framework.TimeoutLong()),
func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/ide/testdata-gpg-nonroot")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/ide/testdata-gpg-nonroot", initialDir)

contextName := fmt.Sprintf("gpg-ctx-%d", time.Now().UnixNano())
err = f.DevsyContextCreate(ctx, contextName)
err := f.DevsyContextCreate(ctx, contextName)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyContextUse(cleanupCtx, config.DefaultContext)
Expand Down
6 changes: 2 additions & 4 deletions e2e/tests/ide/ide.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,9 @@ var _ = ginkgo.Describe("devsy ide test suite", ginkgo.Label("ide"), ginkgo.Orde
ginkgo.It(
"start ides", ginkgo.SpecTimeout(framework.TimeoutShort()), func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/ide/testdata")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/ide/testdata", initialDir)

err = f.DevsyProviderAdd(ctx, "docker")
err := f.DevsyProviderAdd(ctx, "docker")
framework.ExpectNoError(err)
err = f.DevsyProviderUse(ctx, "docker")
framework.ExpectNoError(err)
Expand Down
12 changes: 4 additions & 8 deletions e2e/tests/machine/machine.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,15 @@ var _ = ginkgo.Describe("devsy testing machine", ginkgo.Label("machine"), ginkgo
"should add simple machine and then delete it",
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/machine/testdata")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/machine/testdata", initialDir)

f := framework.NewDefaultFramework(initialDir + "/bin")

// Ensure that mock-provider is deleted
_ = f.DevsyProviderDelete(ctx, "mock-provider")

ginkgo.By("Add mock provider")
err = f.DevsyProviderAdd(ctx, tempDir+"/mock-provider.yaml")
err := f.DevsyProviderAdd(ctx, tempDir+"/mock-provider.yaml")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
err = f.DevsyProviderDelete(cleanupCtx, "mock-provider")
Expand Down Expand Up @@ -60,17 +58,15 @@ var _ = ginkgo.Describe("devsy testing machine", ginkgo.Label("machine"), ginkgo
"should delete a non-existing machine and get an error",
ginkgo.SpecTimeout(framework.TimeoutShort()),
func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/machine/testdata")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/machine/testdata", initialDir)

f := framework.NewDefaultFramework(initialDir + "/bin")

// Ensure that mock-provider is deleted
_ = f.DevsyProviderDelete(ctx, "mock-provider")

ginkgo.By("Add mock provider")
err = f.DevsyProviderAdd(ctx, tempDir+"/mock-provider.yaml")
err := f.DevsyProviderAdd(ctx, tempDir+"/mock-provider.yaml")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
err = f.DevsyProviderDelete(cleanupCtx, "mock-provider")
Expand Down
17 changes: 5 additions & 12 deletions e2e/tests/up/handles_errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ var _ = ginkgo.Describe(
"make sure devsy output is correct and log-output works correctly",
func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/up/testdata/docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/docker", initialDir)

err = f.DevsyProviderAdd(ctx, "docker", "--name", "test-docker")
err := f.DevsyProviderAdd(ctx, "docker", "--name", "test-docker")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
err := f.DevsyProviderDelete(cleanupCtx, "test-docker")
Expand Down Expand Up @@ -100,11 +98,10 @@ var _ = ginkgo.Describe(
_ = f.DevsyProviderDelete(cleanupCtx, "docker")
})

tempDir, err := framework.CopyToTempDir(
tempDir := framework.CopyTestdata(
"tests/up/testdata/docker-invalid-bind-mount",
initialDir,
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)

err = f.DevsyUp(ctx, tempDir, "--debug")

Expand Down Expand Up @@ -139,11 +136,7 @@ var _ = ginkgo.Describe(
_ = f.DevsyProviderDelete(cleanupCtx, "docker")
})

tempDir, err := framework.CopyToTempDir(
"tests/up/testdata/docker-recovery",
)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/docker-recovery", initialDir)
ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
_ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir, "--force")
})
Expand Down
5 changes: 1 addition & 4 deletions e2e/tests/up/microsandbox_session.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,7 @@ func (s *microsandboxTestSession) newWorkspace() string {
}

func (s *microsandboxTestSession) copyWorkspace(source string) string {
workspace, err := framework.CopyToTempDir(source)
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, s.initialDir, workspace)
return workspace
return framework.CopyTestdata(source, s.initialDir)
}

func (s *microsandboxTestSession) addProvider(ctx context.Context, source, name string) {
Expand Down
6 changes: 2 additions & 4 deletions e2e/tests/up/provider_docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,10 @@ var _ = ginkgo.Describe(
}, ginkgo.SpecTimeout(framework.TimeoutShort()))

ginkgo.It("existing running container", func(ctx context.Context) {
tempDir, err := framework.CopyToTempDir("tests/up/testdata/no-devcontainer")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, dtc.initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/no-devcontainer", dtc.initialDir)
ginkgo.DeferCleanup(dtc.f.DevsyWorkspaceDelete, tempDir)

err = dtc.dockerHelper.Run(
err := dtc.dockerHelper.Run(
ctx,
[]string{
"run",
Expand Down
6 changes: 2 additions & 4 deletions e2e/tests/up/provider_kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,10 @@ var _ = ginkgo.Describe(

ginkgo.It("runs devsy in Kubernetes", func(ctx context.Context) {
f := framework.NewDefaultFramework(initialDir + "/bin")
tempDir, err := framework.CopyToTempDir("tests/up/testdata/kubernetes")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(framework.CleanupTempDir, initialDir, tempDir)
tempDir := framework.CopyTestdata("tests/up/testdata/kubernetes", initialDir)

_ = f.DevsyProviderDelete(ctx, "kubernetes")
err = f.DevsyProviderAdd(ctx, "kubernetes", "-o", "KUBERNETES_NAMESPACE=devsy")
err := f.DevsyProviderAdd(ctx, "kubernetes", "-o", "KUBERNETES_NAMESPACE=devsy")
framework.ExpectNoError(err)
ginkgo.DeferCleanup(func(cleanupCtx context.Context) {
err := f.DevsyProviderDelete(cleanupCtx, "kubernetes")
Expand Down
Loading