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
126 changes: 28 additions & 98 deletions e2e/tests/up-docker-compose/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,32 +45,29 @@ var _ = ginkgo.Describe(
framework.ExpectNoError(err)
})

ginkgo.It("root folder", func(ctx context.Context) {
tempDir, workspace, err := tc.setupAndStartWorkspace(
ctx,
ginkgo.DescribeTable(
"starts workspace from testdata",
func(ctx context.Context, testDataPath string) {
tempDir, workspace, err := tc.setupAndStartWorkspace(ctx, testDataPath)
framework.ExpectNoError(err)
framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir))
},
ginkgo.Entry(
"root folder",
"tests/up-docker-compose/testdata/docker-compose",
)
framework.ExpectNoError(err)
framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir))
}, ginkgo.SpecTimeout(framework.TimeoutLong()))

ginkgo.It("sub-folder", func(ctx context.Context) {
tempDir, workspace, err := tc.setupAndStartWorkspace(
ctx,
ginkgo.SpecTimeout(framework.TimeoutLong()),
),
ginkgo.Entry(
"sub-folder",
"tests/up-docker-compose/testdata/docker-compose-subfolder",
)
framework.ExpectNoError(err)
framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir))
}, ginkgo.SpecTimeout(framework.TimeoutLong()))

ginkgo.It("overrides", func(ctx context.Context) {
tempDir, workspace, err := tc.setupAndStartWorkspace(
ctx,
ginkgo.SpecTimeout(framework.TimeoutLong()),
),
ginkgo.Entry(
"overrides",
"tests/up-docker-compose/testdata/docker-compose-overrides",
)
framework.ExpectNoError(err)
framework.ExpectNoError(tc.verifyWorkspaceMount(ctx, workspace, tempDir))
}, ginkgo.SpecTimeout(framework.TimeoutLong()))
ginkgo.SpecTimeout(framework.TimeoutLong()),
),
)

ginkgo.It("env-file", func(ctx context.Context) {
tempDir, err := setupWorkspace(
Expand All @@ -89,15 +86,7 @@ var _ = ginkgo.Describe(
workspace, err := tc.f.FindWorkspace(ctx, tempDir)
framework.ExpectNoError(err)

ids, err := findComposeContainer(
ctx,
tc.dockerHelper,
tc.composeHelper,
workspace.UID,
"app",
)
framework.ExpectNoError(err)
gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created")
tc.expectSingleAppContainer(ctx, workspace)
gomega.Expect(devsyUpOutput).
NotTo(gomega.ContainSubstring("Defaulting to a blank string."))
}, ginkgo.SpecTimeout(framework.TimeoutLong()))
Expand All @@ -116,15 +105,7 @@ var _ = ginkgo.Describe(
workspace, err := tc.f.FindWorkspace(ctx, tempDir)
framework.ExpectNoError(err)

initialIds, err := findComposeContainer(
ctx,
tc.dockerHelper,
tc.composeHelper,
workspace.UID,
"app",
)
framework.ExpectNoError(err)
gomega.Expect(initialIds).To(gomega.HaveLen(1), "1 compose container to be created")
tc.expectSingleAppContainer(ctx, workspace)

err = tc.f.DevsyWorkspaceStop(ctx, tempDir)
framework.ExpectNoError(err)
Expand Down Expand Up @@ -266,15 +247,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

ids, err := findComposeContainer(
ctx,
tc.dockerHelper,
tc.composeHelper,
workspace.UID,
"app",
)
framework.ExpectNoError(err)
gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created")
tc.expectSingleAppContainer(ctx, workspace)

err = tc.f.ExecCommand(
ctx,
Expand All @@ -293,15 +266,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

ids, err := findComposeContainer(
ctx,
tc.dockerHelper,
tc.composeHelper,
workspace.UID,
"app",
)
framework.ExpectNoError(err)
gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created")
tc.expectSingleAppContainer(ctx, workspace)

err = tc.f.ExecCommand(
ctx,
Expand Down Expand Up @@ -502,15 +467,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

ids, err := findComposeContainer(
ctx,
tc.dockerHelper,
tc.composeHelper,
workspace.UID,
"app",
)
framework.ExpectNoError(err)
gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created")
tc.expectSingleAppContainer(ctx, workspace)

err = tc.f.ExecCommand(
ctx,
Expand Down Expand Up @@ -550,18 +507,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

ids, err := findComposeContainer(
ctx,
tc.dockerHelper,
tc.composeHelper,
workspace.UID,
"app",
)
framework.ExpectNoError(err)
gomega.Expect(ids).To(
gomega.HaveLen(1),
"1 compose container to be created",
)
tc.expectSingleAppContainer(ctx, workspace)

// Verify SET_VAR is set
err = tc.f.ExecCommand(
Expand Down Expand Up @@ -599,15 +545,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

ids, err := findComposeContainer(
ctx,
tc.dockerHelper,
tc.composeHelper,
workspace.UID,
"app",
)
framework.ExpectNoError(err)
gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created")
tc.expectSingleAppContainer(ctx, workspace)

err = tc.f.ExecCommand(
ctx,
Expand All @@ -632,15 +570,7 @@ var _ = ginkgo.Describe(
)
framework.ExpectNoError(err)

ids, err := findComposeContainer(
ctx,
tc.dockerHelper,
tc.composeHelper,
workspace.UID,
"app",
)
framework.ExpectNoError(err)
gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created")
tc.expectSingleAppContainer(ctx, workspace)

devContainerID, err := tc.f.DevsySSH(ctx, tempDir, "cat $HOME/dev-container-id.out")
framework.ExpectNoError(err)
Expand Down
16 changes: 16 additions & 0 deletions e2e/tests/up-docker-compose/helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,22 @@ func (tc *testContext) getAppContainer(
return tc.inspectContainer(ctx, ids)
}

func (tc *testContext) expectSingleAppContainer(
ctx context.Context,
workspace *provider2.Workspace,
) []string {
ids, err := findComposeContainer(
ctx,
tc.dockerHelper,
tc.composeHelper,
workspace.UID,
"app",
)
framework.ExpectNoError(err)
gomega.Expect(ids).To(gomega.HaveLen(1), "1 compose container to be created")
return ids
}

func (tc *testContext) findAppAndSidecar(
ctx context.Context,
workspaceUID string,
Expand Down
Loading