Browse code
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 authored on 2016/09/20 04:53:14Showing 1 changed files
| ... | ... |
@@ -13,12 +13,20 @@ import ( |
| 13 | 13 |
|
| 14 | 14 |
func (s *DockerSuite) TestBuildApiDockerFileRemote(c *check.C) {
|
| 15 | 15 |
testRequires(c, NotUserNamespace) |
| 16 |
- server, err := fakeStorage(map[string]string{
|
|
| 17 |
- "testD": `FROM busybox |
|
| 16 |
+ var testD string |
|
| 17 |
+ if daemonPlatform == "windows" {
|
|
| 18 |
+ testD = `FROM busybox |
|
| 18 | 19 |
COPY * /tmp/ |
| 19 | 20 |
RUN find / -name ba* |
| 20 |
-RUN find /tmp/`, |
|
| 21 |
- }) |
|
| 21 |
+RUN find /tmp/` |
|
| 22 |
+ } else {
|
|
| 23 |
+ // -xdev is required because sysfs can cause EPERM |
|
| 24 |
+ testD = `FROM busybox |
|
| 25 |
+COPY * /tmp/ |
|
| 26 |
+RUN find / -xdev -name ba* |
|
| 27 |
+RUN find /tmp/` |
|
| 28 |
+ } |
|
| 29 |
+ server, err := fakeStorage(map[string]string{"testD": testD})
|
|
| 22 | 30 |
c.Assert(err, checker.IsNil) |
| 23 | 31 |
defer server.Close() |
| 24 | 32 |
|