diff --git a/tests/compose-e2e/compose_test.go b/tests/compose-e2e/compose_test.go index a36a67e3e..47ff71c31 100644 --- a/tests/compose-e2e/compose_test.go +++ b/tests/compose-e2e/compose_test.go @@ -49,15 +49,8 @@ func TestLocalComposeUp(t *testing.T) { const projectName = "compose-e2e-demo" - t.Run("build", func(t *testing.T) { - res := c.RunDockerCmd("compose", "build", "-f", "../composefiles/demo_multi_port.yaml") - res.Assert(t, icmd.Expected{Out: "COPY words.sql /docker-entrypoint-initdb.d/"}) - res.Assert(t, icmd.Expected{Out: "COPY pom.xml ."}) - res.Assert(t, icmd.Expected{Out: "COPY static /static/"}) - }) - t.Run("up", func(t *testing.T) { - c.RunDockerCmd("compose", "up", "-d", "-f", "../composefiles/demo_multi_port.yaml", "--project-name", projectName, "-d") + c.RunDockerCmd("compose", "up", "-d", "-f", "./fixtures/sentences/docker-compose.yaml", "--project-name", projectName, "-d") }) t.Run("check running project", func(t *testing.T) { @@ -78,7 +71,7 @@ func TestLocalComposeUp(t *testing.T) { res.Assert(t, icmd.Expected{Out: `"com.docker.compose.project": "compose-e2e-demo"`}) res.Assert(t, icmd.Expected{Out: `"com.docker.compose.oneoff": "False",`}) res.Assert(t, icmd.Expected{Out: `"com.docker.compose.config-hash":`}) - res.Assert(t, icmd.Expected{Out: `"com.docker.compose.project.config_files": "../composefiles/demo_multi_port.yaml"`}) + res.Assert(t, icmd.Expected{Out: `"com.docker.compose.project.config_files": "./fixtures/sentences/docker-compose.yaml"`}) res.Assert(t, icmd.Expected{Out: `"com.docker.compose.project.working_dir":`}) res.Assert(t, icmd.Expected{Out: `"com.docker.compose.service": "web"`}) res.Assert(t, icmd.Expected{Out: `"com.docker.compose.version":`}) @@ -119,7 +112,7 @@ func TestLocalComposeVolume(t *testing.T) { //ensure local test run does not reuse previously build image c.RunDockerOrExitError("rmi", "compose-e2e-volume_nginx") c.RunDockerOrExitError("volume", "rm", projectName+"_staticVol") - c.RunDockerCmd("compose", "up", "-d", "--workdir", "volume-test", "--project-name", projectName) + c.RunDockerCmd("compose", "up", "-d", "--workdir", "fixtures/volume-test", "--project-name", projectName) }) t.Run("access bind mount data", func(t *testing.T) { diff --git a/tests/compose-e2e/fixtures/sentences/docker-compose.yaml b/tests/compose-e2e/fixtures/sentences/docker-compose.yaml new file mode 100644 index 000000000..9ce4902e0 --- /dev/null +++ b/tests/compose-e2e/fixtures/sentences/docker-compose.yaml @@ -0,0 +1,13 @@ +services: + db: + image: gtardif/sentences-db + words: + image: gtardif/sentences-api + ports: + - "8080:8080" + web: + image: gtardif/sentences-web + ports: + - "80:80" + labels: + - "my-label=test" diff --git a/tests/compose-e2e/volume-test/docker-compose.yml b/tests/compose-e2e/fixtures/volume-test/docker-compose.yml similarity index 100% rename from tests/compose-e2e/volume-test/docker-compose.yml rename to tests/compose-e2e/fixtures/volume-test/docker-compose.yml diff --git a/tests/compose-e2e/volume-test/nginx-build/Dockerfile b/tests/compose-e2e/fixtures/volume-test/nginx-build/Dockerfile similarity index 100% rename from tests/compose-e2e/volume-test/nginx-build/Dockerfile rename to tests/compose-e2e/fixtures/volume-test/nginx-build/Dockerfile diff --git a/tests/compose-e2e/volume-test/static/index.html b/tests/compose-e2e/fixtures/volume-test/static/index.html similarity index 100% rename from tests/compose-e2e/volume-test/static/index.html rename to tests/compose-e2e/fixtures/volume-test/static/index.html diff --git a/tests/composefiles/demo_multi_port.yaml b/tests/composefiles/demo_multi_port.yaml index cba9f69fb..2e3414e11 100644 --- a/tests/composefiles/demo_multi_port.yaml +++ b/tests/composefiles/demo_multi_port.yaml @@ -13,5 +13,3 @@ services: image: gtardif/sentences-web ports: - "80:80" - labels: - - "my-label=test"