Преглед изворни кода

Fix TestBuildApiDockerFileRemote

TestBuildApiDockerFileRemote has been consistently failing (EPERM) on the host
with #26618, which prohibits /sys/firmware from being accessed using apparmor.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Akihiro Suda пре 8 година
родитељ
комит
f453261b4a
1 измењених фајлова са 12 додато и 4 уклоњено
  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) {
 func (s *DockerSuite) TestBuildApiDockerFileRemote(c *check.C) {
 	testRequires(c, NotUserNamespace)
 	testRequires(c, NotUserNamespace)
-	server, err := fakeStorage(map[string]string{
-		"testD": `FROM busybox
+	var testD string
+	if daemonPlatform == "windows" {
+		testD = `FROM busybox
 COPY * /tmp/
 COPY * /tmp/
 RUN find / -name ba*
 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)
 	c.Assert(err, checker.IsNil)
 	defer server.Close()
 	defer server.Close()