From 21db026a7c2eed9ee706f4adefe445e9621a2f3b Mon Sep 17 00:00:00 2001 From: Samuel K Date: Sun, 18 Oct 2026 06:29:31 -0600 Subject: [PATCH] refactor(e2e): use CopyTestdata in ssh specs --- e2e/tests/ssh/agent_forward.go | 20 +++++++------------- e2e/tests/ssh/credentials_server_race.go | 6 ++---- e2e/tests/ssh/ports_attributes.go | 16 +++++----------- e2e/tests/ssh/proxy_command.go | 4 +--- e2e/tests/ssh/ssh_tunnel_mode.go | 22 ++++++---------------- e2e/tests/ssh/task_cancel.go | 8 ++------ 6 files changed, 23 insertions(+), 53 deletions(-) diff --git a/e2e/tests/ssh/agent_forward.go b/e2e/tests/ssh/agent_forward.go index 52c2504831..57fbf22422 100644 --- a/e2e/tests/ssh/agent_forward.go +++ b/e2e/tests/ssh/agent_forward.go @@ -42,15 +42,19 @@ var _ = ginkgo.Describe( initialDir, err = os.Getwd() framework.ExpectNoError(err) - tempDir, err = framework.CopyToTempDir("tests/ssh/testdata/agent-forward") - framework.ExpectNoError(err) + authSock, pubKey, agentClean = framework.StartMockSSHAgent(ginkgo.GinkgoT()) + ginkgo.DeferCleanup(agentClean) + + tempDir = framework.CopyTestdata("tests/ssh/testdata/agent-forward", initialDir) f = framework.NewDefaultFramework(initialDir + "/bin") _ = f.DevsyProviderAdd(ctx, "docker") err = f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) - authSock, pubKey, agentClean = framework.StartMockSSHAgent(ginkgo.GinkgoT()) + ginkgo.DeferCleanup(func(cleanupCtx context.Context) { + _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) + }) devsyUpCtx, cancel := context.WithTimeout(ctx, 5*time.Minute) defer cancel() @@ -61,16 +65,6 @@ var _ = ginkgo.Describe( host = filepath.Base(tempDir) + ".devsy" }) - ginkgo.AfterAll(func(ctx ginkgo.SpecContext) { - if f != nil && tempDir != "" { - _ = f.DevsyWorkspaceDelete(ctx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) - } - if agentClean != nil { - agentClean() - } - }) - ginkgo.It( "socket is stable across sessions on the same connection", ginkgo.SpecTimeout(framework.TimeoutModerate()), diff --git a/e2e/tests/ssh/credentials_server_race.go b/e2e/tests/ssh/credentials_server_race.go index 721b21aff5..a51b12650e 100644 --- a/e2e/tests/ssh/credentials_server_race.go +++ b/e2e/tests/ssh/credentials_server_race.go @@ -33,17 +33,15 @@ var _ = ginkgo.Describe( "should not surface credentials-server port errors when two ssh sessions race for the same workspace", ginkgo.SpecTimeout(framework.TimeoutModerate()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir) f := framework.NewDefaultFramework(initialDir + "/bin") _ = f.DevsyProviderAdd(ctx, "docker") - err = f.DevsyProviderUse(ctx, "docker") + err := f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) upDeadline := time.Now().Add(5 * time.Minute) diff --git a/e2e/tests/ssh/ports_attributes.go b/e2e/tests/ssh/ports_attributes.go index 1d27009078..e8dacd4a41 100644 --- a/e2e/tests/ssh/ports_attributes.go +++ b/e2e/tests/ssh/ports_attributes.go @@ -34,17 +34,15 @@ var _ = ginkgo.Describe("devsy portsAttributes e2e", ginkgo.Skip("skipping on windows") } - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/ports-attributes") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/ports-attributes", initialDir) f := framework.NewDefaultFramework(initialDir + "/bin") _ = f.DevsyProviderAdd(ctx, "docker") - err = f.DevsyProviderUse(ctx, "docker") + err := f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) err = f.DevsyUp(ctx, tempDir) @@ -136,17 +134,15 @@ var _ = ginkgo.Describe("devsy portsAttributes e2e", ginkgo.Skip("skipping on windows") } - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/ports-attributes") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/ports-attributes", initialDir) f := framework.NewDefaultFramework(initialDir + "/bin") _ = f.DevsyProviderAdd(ctx, "docker") - err = f.DevsyProviderUse(ctx, "docker") + err := f.DevsyProviderUse(ctx, "docker") framework.ExpectNoError(err) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) err = f.DevsyUp(ctx, tempDir) @@ -225,8 +221,7 @@ var _ = ginkgo.Describe("devsy portsAttributes e2e", _ = hostListener.Close() }) - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/ports-attributes") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/ports-attributes", initialDir) f := framework.NewDefaultFramework(initialDir + "/bin") _ = f.DevsyProviderAdd(ctx, "docker") @@ -235,7 +230,6 @@ var _ = ginkgo.Describe("devsy portsAttributes e2e", ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) err = f.DevsyUp(ctx, tempDir) diff --git a/e2e/tests/ssh/proxy_command.go b/e2e/tests/ssh/proxy_command.go index 88e4aa3533..1b74ee15a8 100644 --- a/e2e/tests/ssh/proxy_command.go +++ b/e2e/tests/ssh/proxy_command.go @@ -35,8 +35,7 @@ var _ = ginkgo.Describe( ginkgo.Skip("skipping on non-Windows") } - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir) baseFramework := framework.NewDefaultFramework(initialDir + "/bin") sourcePath := filepath.Join(baseFramework.DevsyBinDir, baseFramework.DevsyBinName) @@ -55,7 +54,6 @@ var _ = ginkgo.Describe( sshConfigPath := filepath.Join(ginkgo.GinkgoT().TempDir(), "ssh config") ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) upCtx, cancelUp := context.WithTimeout(ctx, 5*time.Minute) diff --git a/e2e/tests/ssh/ssh_tunnel_mode.go b/e2e/tests/ssh/ssh_tunnel_mode.go index 3e3f4c7a69..f2c842d35e 100644 --- a/e2e/tests/ssh/ssh_tunnel_mode.go +++ b/e2e/tests/ssh/ssh_tunnel_mode.go @@ -44,14 +44,12 @@ var _ = ginkgo.Describe( ginkgo.It("should start workspace with --ssh-tunnel and SSH into it", ginkgo.SpecTimeout(framework.TimeoutModerate()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir) f := setupTunnelProvider(ctx, initialDir) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) taskID, err := startDetachedTunnelUp(ctx, f, tempDir) @@ -74,8 +72,7 @@ var _ = ginkgo.Describe( ginkgo.It("should write SSH config with Hostname and Port instead of ProxyCommand", ginkgo.SpecTimeout(framework.TimeoutModerate()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir) sshConfigDir := ginkgo.GinkgoT().TempDir() sshConfigPath := filepath.Join(sshConfigDir, "config") @@ -84,7 +81,6 @@ var _ = ginkgo.Describe( ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) taskID, err := startDetachedTunnelUp(ctx, f, tempDir, "--ssh-config", sshConfigPath) @@ -115,8 +111,7 @@ var _ = ginkgo.Describe( ginkgo.It("should establish a working local TCP tunnel listener", ginkgo.SpecTimeout(framework.TimeoutModerate()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir) sshConfigDir := ginkgo.GinkgoT().TempDir() sshConfigPath := filepath.Join(sshConfigDir, "config") @@ -125,7 +120,6 @@ var _ = ginkgo.Describe( ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) taskID, err := startDetachedTunnelUp(ctx, f, tempDir, "--ssh-config", sshConfigPath) @@ -163,14 +157,12 @@ var _ = ginkgo.Describe( ginkgo.It("should handle multiple sequential SSH commands via tunnel", ginkgo.SpecTimeout(framework.TimeoutModerate()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir) f := setupTunnelProvider(ctx, initialDir) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) taskID, err := startDetachedTunnelUp(ctx, f, tempDir) @@ -213,8 +205,7 @@ var _ = ginkgo.Describe( ginkgo.It("should fall back to ProxyCommand when tunnel mode is not enabled", ginkgo.SpecTimeout(framework.TimeoutModerate()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir) sshConfigDir := ginkgo.GinkgoT().TempDir() sshConfigPath := filepath.Join(sshConfigDir, "config") @@ -223,12 +214,11 @@ var _ = ginkgo.Describe( ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) devsyUpCtx, cancel := context.WithDeadline(ctx, time.Now().Add(5*time.Minute)) defer cancel() - err = f.DevsyUp(devsyUpCtx, tempDir, "--ssh-config", sshConfigPath) + err := f.DevsyUp(devsyUpCtx, tempDir, "--ssh-config", sshConfigPath) framework.ExpectNoError(err) configBytes, err := os.ReadFile(filepath.Clean(sshConfigPath)) diff --git a/e2e/tests/ssh/task_cancel.go b/e2e/tests/ssh/task_cancel.go index d916641296..fb5a296784 100644 --- a/e2e/tests/ssh/task_cancel.go +++ b/e2e/tests/ssh/task_cancel.go @@ -32,14 +32,12 @@ var _ = ginkgo.Describe( ginkgo.It("should cancel a detached tunnel task and keep the workspace stopped", ginkgo.SpecTimeout(framework.TimeoutLong()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir) f := setupTunnelProvider(ctx, initialDir) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) taskID, err := startDetachedTunnelUp(ctx, f, tempDir) @@ -73,14 +71,12 @@ var _ = ginkgo.Describe( ginkgo.It("should quiesce a persisted detached task when stop runs without a task ID", ginkgo.SpecTimeout(framework.TimeoutLong()), func(ctx context.Context) { - tempDir, err := framework.CopyToTempDir("tests/ssh/testdata/local-test") - framework.ExpectNoError(err) + tempDir := framework.CopyTestdata("tests/ssh/testdata/local-test", initialDir) f := setupTunnelProvider(ctx, initialDir) ginkgo.DeferCleanup(func(cleanupCtx context.Context) { _ = f.DevsyWorkspaceDelete(cleanupCtx, tempDir) - framework.CleanupTempDir(initialDir, tempDir) }) taskID, err := startDetachedTunnelUp(ctx, f, tempDir)