Ver código fonte

Merge pull request #26720 from AkihiroSuda/fix-TestBuildApiDockerFileRemote

[test] Fix TestBuildApiDockerFileRemote
Sebastiaan van Stijn 8 anos atrás
pai
commit
6eb6eaf718
1 arquivos alterados com 12 adições e 4 exclusões
  1. 12 4
      integration-cli/docker_api_build_test.go

+ 12 - 4
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()