From 81d16411398c20a7ddc0bbe3e5e1ce0bd95d6519 Mon Sep 17 00:00:00 2001 From: LK4D4 Date: Mon, 26 May 2014 23:23:46 +0400 Subject: [PATCH] Move expose build test to integration-cli Docker-DCO-1.1-Signed-off-by: Alexandr Morozov (github: LK4D4) --- integration-cli/docker_cli_build_test.go | 15 +++++++++++++++ integration/buildfile_test.go | 15 --------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index ade7efe99f..4a2c5eda6d 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -525,6 +525,21 @@ func TestBuildCmd(t *testing.T) { logDone("build - cmd") } +func TestBuildExpose(t *testing.T) { + checkSimpleBuild(t, + ` + FROM scratch + EXPOSE 4243 + `, + + "testbuildimg", + "{{json .config.ExposedPorts}}", + `{"4243/tcp":{}}`) + + deleteImages("testbuildimg") + logDone("build - expose") +} + // TODO: TestCaching // TODO: TestADDCacheInvalidation diff --git a/integration/buildfile_test.go b/integration/buildfile_test.go index 5d508ff8f3..db56537ad5 100644 --- a/integration/buildfile_test.go +++ b/integration/buildfile_test.go @@ -414,21 +414,6 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u return image, err } -func TestBuildExpose(t *testing.T) { - img, err := buildImage(testContextTemplate{` - from {IMAGE} - expose 4243 - `, - nil, nil}, t, nil, true) - if err != nil { - t.Fatal(err) - } - - if _, exists := img.Config.ExposedPorts[nat.NewPort("tcp", "4243")]; !exists { - t.Fail() - } -} - func TestBuildEntrypoint(t *testing.T) { img, err := buildImage(testContextTemplate{` from {IMAGE}