diff options
| author | Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> | 2016-09-20 17:57:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-20 17:57:01 +0200 |
| commit | 6eb6eaf7181ce9a37fd9bc60422f9993aa59d3c3 (patch) | |
| tree | 0e295c8fc0fc608acae8171540b29b61d472d92c | |
| parent | a65f01052ea7c24f0b07eb2893904e3d08b77083 (diff) | |
| parent | f453261b4a53ab71db8b78ea119b4edd69b95ae3 (diff) | |
| download | docker-6eb6eaf7181ce9a37fd9bc60422f9993aa59d3c3.tar.gz | |
Merge pull request #26720 from AkihiroSuda/fix-TestBuildApiDockerFileRemote
[test] Fix TestBuildApiDockerFileRemote
| -rw-r--r-- | integration-cli/docker_api_build_test.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/integration-cli/docker_api_build_test.go b/integration-cli/docker_api_build_test.go index 04d855cfef..b905d89bbb 100644 --- a/integration-cli/docker_api_build_test.go +++ b/integration-cli/docker_api_build_test.go @@ -13,12 +13,20 @@ import ( func (s *DockerSuite) TestBuildApiDockerFileRemote(c *check.C) { testRequires(c, NotUserNamespace) - server, err := fakeStorage(map[string]string{ - "testD": `FROM busybox + var testD string + if daemonPlatform == "windows" { + testD = `FROM busybox COPY * /tmp/ RUN find / -name ba* -RUN find /tmp/`, - }) +RUN find /tmp/` + } else { + // -xdev is required because sysfs can cause EPERM + testD = `FROM busybox +COPY * /tmp/ +RUN find / -xdev -name ba* +RUN find /tmp/` + } + server, err := fakeStorage(map[string]string{"testD": testD}) c.Assert(err, checker.IsNil) defer server.Close() |