diff options
| author | Christopher Crone <christopher.crone@docker.com> | 2017-09-11 16:34:08 +0200 |
|---|---|---|
| committer | Christopher Crone <christopher.crone@docker.com> | 2017-09-14 19:27:09 +0200 |
| commit | f089a1df393228085c4895b8db0fa95128173398 (patch) | |
| tree | e6b6564d2f31c3ca6c05465cf52c466c7415678d /integration-cli/docker_api_build_test.go | |
| parent | b1fb41988dc1b7071a58f76f6ad2730fc1a02eca (diff) | |
| download | docker-f089a1df393228085c4895b8db0fa95128173398.tar.gz | |
Skip some tests for E2E
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
Diffstat (limited to 'integration-cli/docker_api_build_test.go')
| -rw-r--r-- | integration-cli/docker_api_build_test.go | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index 59b451024e..22b6e5c501 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -27,7 +27,9 @@ import ( ) func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) { - testRequires(c, NotUserNamespace) + // E2E: Requires built httpserver. + testRequires(c, NotUserNamespace, NotE2E) + var testD string if testEnv.DaemonPlatform() == "windows" { testD = `FROM busybox @@ -57,6 +59,9 @@ RUN find /tmp/` } func (s *DockerSuite) TestBuildAPIRemoteTarballContext(c *check.C) { + // E2E: Requires built httpserver. + testRequires(c, NotE2E) + buffer := new(bytes.Buffer) tw := tar.NewWriter(buffer) defer tw.Close() @@ -88,6 +93,9 @@ func (s *DockerSuite) TestBuildAPIRemoteTarballContext(c *check.C) { } func (s *DockerSuite) TestBuildAPIRemoteTarballContextWithCustomDockerfile(c *check.C) { + // E2E: Requires built httpserver. + testRequires(c, NotE2E) + buffer := new(bytes.Buffer) tw := tar.NewWriter(buffer) defer tw.Close() @@ -142,6 +150,8 @@ RUN echo 'right' } func (s *DockerSuite) TestBuildAPILowerDockerfile(c *check.C) { + // E2E: Requires built httpserver. + testRequires(c, NotE2E) git := fakegit.New(c, "repo", map[string]string{ "dockerfile": `FROM busybox RUN echo from dockerfile`, @@ -160,6 +170,9 @@ RUN echo from dockerfile`, } func (s *DockerSuite) TestBuildAPIBuildGitWithF(c *check.C) { + // E2E: Test requires go and contrib source. + testRequires(c, NotE2E) + git := fakegit.New(c, "repo", map[string]string{ "baz": `FROM busybox RUN echo from baz`, @@ -181,7 +194,8 @@ RUN echo from Dockerfile`, } func (s *DockerSuite) TestBuildAPIDoubleDockerfile(c *check.C) { - testRequires(c, UnixCli) // dockerfile overwrites Dockerfile on Windows + // E2E: Requires built httpserver. + testRequires(c, UnixCli, NotE2E) // dockerfile overwrites Dockerfile on Windows git := fakegit.New(c, "repo", map[string]string{ "Dockerfile": `FROM busybox RUN echo from Dockerfile`, @@ -366,6 +380,9 @@ func (s *DockerRegistrySuite) TestBuildCopyFromForcePull(c *check.C) { } func (s *DockerSuite) TestBuildAddRemoteNoDecompress(c *check.C) { + // E2E: Requires built httpserver. + testRequires(c, NotE2E) + buffer := new(bytes.Buffer) tw := tar.NewWriter(buffer) dt := []byte("contents") |