Skip to content

fix(e2e): increase timeout for container-pull-heavy E2E tests #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skevetter merged 1 commit into from
May 5, 2026
Merged

fix(e2e): increase timeout for container-pull-heavy E2E tests #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions e2e/tests/up-docker-compose/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)
framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("sub-folder", func(ctx context.Context) {
tempDir, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -53,7 +53,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)
framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("overrides", func(ctx context.Context) {
tempDir, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -62,7 +62,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)
framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("env-file", func(ctx context.Context) {
tempDir, err := setupWorkspace(
Expand Down Expand Up @@ -92,7 +92,7 @@ var _ = ginkgo.Describe(
gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created")
gomega.Expect(devsyUpOutput).
NotTo(gomega.ContainSubstring("Defaulting to a blank string."))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("restart", func(ctx context.Context) {
tempDir, err := setupWorkspace(
Expand Down Expand Up @@ -133,7 +133,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)
gomega.Expect(restartIds).To(gomega.HaveLen(1), "1 compose container after restart")
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("environment variables", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -160,7 +160,7 @@ var _ = ginkgo.Describe(
[]string{"ssh", "--command", "echo $FOO", workspace.ID},
)
framework.ExpectNoError(err)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("user", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -187,7 +187,7 @@ var _ = ginkgo.Describe(
[]string{"ssh", "--command", "ps u -p 1", workspace.ID},
)
framework.ExpectNoError(err)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("override command", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -201,7 +201,7 @@ var _ = ginkgo.Describe(
gomega.Expect(detail.Config.Entrypoint).
NotTo(gomega.ContainElement("bash"), "overrides container entry point")
gomega.Expect(detail.Config.Cmd).To(gomega.BeEmpty(), "overrides container command")
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It(
"implements updateRemoteUserUID with root container user",
Expand Down Expand Up @@ -265,7 +265,7 @@ var _ = ginkgo.Describe(
verifyHostFileAccess(hostFile, expectedContent)
verifyHostFileOwnership(hostFile, testUID, testGID, testUID == 0)
},
ginkgo.SpecTimeout(framework.TimeoutShort()),
ginkgo.SpecTimeout(framework.TimeoutModerate()),
)

ginkgo.It(
Expand Down Expand Up @@ -323,7 +323,7 @@ var _ = ginkgo.Describe(
verifyHostFileAccess(hostFile, expectedContent)
verifyHostFileOwnership(hostFile, testUID, testGID, testUID == 0)
},
ginkgo.SpecTimeout(framework.TimeoutShort()),
ginkgo.SpecTimeout(framework.TimeoutModerate()),
)

ginkgo.It("privileged", func(ctx context.Context) {
Expand All @@ -337,7 +337,7 @@ var _ = ginkgo.Describe(
framework.ExpectNoError(err)
gomega.Expect(detail.HostConfig.Privileged).
To(gomega.BeTrue(), "container run with privileged true")
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("capabilities", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -354,7 +354,7 @@ var _ = ginkgo.Describe(
gomega.Expect(detail.HostConfig.CapAdd).
To(gomega.Or(gomega.ContainElement("NET_ADMIN"), gomega.ContainElement("CAP_NET_ADMIN")),
"devcontainer configuration can add capabilities")
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("security options", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -369,7 +369,7 @@ var _ = ginkgo.Describe(
To(gomega.ContainElement("seccomp=unconfined"), "securityOpts contain seccomp=unconfined")
gomega.Expect(detail.HostConfig.SecurityOpt).
To(gomega.ContainElement("apparmor=unconfined"), "securityOpts contain apparmor=unconfined")
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("remote env", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand Down Expand Up @@ -405,7 +405,7 @@ var _ = ginkgo.Describe(
[]string{"ssh", "--command", "cat $HOME/remote-env.out", workspace.ID},
)
framework.ExpectNoError(err)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("remote env null unsets variable", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand Down Expand Up @@ -454,7 +454,7 @@ var _ = ginkgo.Describe(
},
)
framework.ExpectNoError(err)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("remote user", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -481,7 +481,7 @@ var _ = ginkgo.Describe(
[]string{"ssh", "--command", "cat $HOME/remote-user.out", workspace.ID},
)
framework.ExpectNoError(err)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("variables substitution", func(ctx context.Context) {
tempDir, workspace, err := tc.setupAndStartWorkspace(
Expand Down Expand Up @@ -544,6 +544,6 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)
gomega.Expect(containerWorkspaceFolderBasename).To(gomega.Equal("workspaces"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))
},
)
32 changes: 16 additions & 16 deletions e2e/tests/up-docker-compose/up_docker_compose.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ var _ = ginkgo.Describe(
bar, err := tc.execSSH(ctx, tempDir, "cat $HOME/mnt2/bar.txt")
framework.ExpectNoError(err)
gomega.Expect(strings.TrimSpace(bar)).To(gomega.Equal("FOO"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("port forwarding", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand Down Expand Up @@ -158,7 +158,7 @@ var _ = ginkgo.Describe(
gomega.MatchError("signal: killed"),
gomega.MatchError(context.Canceled),
))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("features", func(ctx context.Context) {
tempDir, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -182,7 +182,7 @@ var _ = ginkgo.Describe(
framework.ExpectNoError(err)
gomega.Expect(vclusterVersionOutput).
To(gomega.ContainSubstring("vcluster version 0.24.1"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It(
"does not retag shared image when applying features to image backed services",
Expand Down Expand Up @@ -346,7 +346,7 @@ var _ = ginkgo.Describe(
postAttachCommand, err := tc.execSSH(ctx, tempDir, "cat $HOME/post-attach-command.out")
framework.ExpectNoError(err)
gomega.Expect(postAttachCommand).To(gomega.Equal("postAttachCommand"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("parallel object based commands", func(ctx context.Context) {
tempDir, err := setupWorkspace(
Expand Down Expand Up @@ -380,7 +380,7 @@ var _ = ginkgo.Describe(
parallelB, err := tc.execSSH(ctx, tempDir, "cat $HOME/parallel-b.out")
framework.ExpectNoError(err)
gomega.Expect(parallelB).To(gomega.Equal("parallelB"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("commands with quotes", func(ctx context.Context) {
tempDir, err := setupWorkspace(
Expand Down Expand Up @@ -410,7 +410,7 @@ var _ = ginkgo.Describe(
quotedTest, err := tc.execSSH(ctx, tempDir, "cat $HOME/quoted-test.out")
framework.ExpectNoError(err)
gomega.Expect(quotedTest).To(gomega.Equal("quoted value"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("v2 features", func(ctx context.Context) {
_, ws, err := tc.setupAndStartWorkspace(
Expand All @@ -427,7 +427,7 @@ var _ = ginkgo.Describe(
var containerDetails []container.InspectResponse
err = tc.dockerHelper.Inspect(ctx, ids, "container", &containerDetails)
framework.ExpectNoError(err)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("v1 fallback", func(ctx context.Context) {
_, ws, err := tc.setupAndStartWorkspace(
Expand All @@ -444,7 +444,7 @@ var _ = ginkgo.Describe(
var containerDetails []container.InspectResponse
err = tc.dockerHelper.Inspect(ctx, ids, "container", &containerDetails)
framework.ExpectNoError(err)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("multiple services", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand Down Expand Up @@ -472,7 +472,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)
gomega.Expect(dbIDs).To(gomega.HaveLen(1), "db container to be created")
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("specific services", func(ctx context.Context) {
_, workspace, err := tc.setupAndStartWorkspace(
Expand Down Expand Up @@ -500,7 +500,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)
gomega.Expect(dbIDs).To(gomega.BeEmpty(), "db container not to be created")
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("invalid runServices returns error", func(ctx context.Context) {
tempDir, err := setupWorkspace(
Expand All @@ -513,15 +513,15 @@ var _ = ginkgo.Describe(
})
gomega.Expect(err).To(gomega.HaveOccurred())
gomega.Expect(stderr).To(gomega.ContainSubstring("nonexistent-service"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("user lookup with no remoteUser", func(ctx context.Context) {
_, _, err := tc.setupAndStartWorkspace(
ctx,
"tests/up-docker-compose/testdata/docker-compose-lookup-user",
)
framework.ExpectNoError(err)
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("dockerfile with args", func(ctx context.Context) {
tempDir, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -545,7 +545,7 @@ var _ = ginkgo.Describe(
framework.ExpectNoError(err)
gomega.Expect(strings.TrimSpace(buildArgs)).
To(gomega.Equal("ghcr.io/devsy-org/test-images/go:1"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It("multi-stage dockerfile with args", func(ctx context.Context) {
tempDir, workspace, err := tc.setupAndStartWorkspace(
Expand All @@ -569,7 +569,7 @@ var _ = ginkgo.Describe(
framework.ExpectNoError(err)
gomega.Expect(strings.TrimSpace(buildArgs)).
To(gomega.Equal("ghcr.io/devsy-org/test-images/go:1"))
}, ginkgo.SpecTimeout(framework.TimeoutShort()))
}, ginkgo.SpecTimeout(framework.TimeoutModerate()))

ginkgo.It(
"shutdownAction stopCompose stops all services",
Expand All @@ -593,7 +593,7 @@ var _ = ginkgo.Describe(
gomega.Expect(sidecarRunning).
To(gomega.BeFalse(), "sidecar container should be stopped")
},
ginkgo.SpecTimeout(framework.TimeoutShort()),
ginkgo.SpecTimeout(framework.TimeoutModerate()),
)

ginkgo.It(
Expand All @@ -618,7 +618,7 @@ var _ = ginkgo.Describe(
gomega.Expect(sidecarRunning).
To(gomega.BeTrue(), "sidecar container should still be running")
},
ginkgo.SpecTimeout(framework.TimeoutShort()),
ginkgo.SpecTimeout(framework.TimeoutModerate()),
)
},
)
Loading
Loading