Browse code
Merge pull request #29827 from vdemeester/integration-fixes-for-userns
Updates some integration tests to fix userns builds
Vincent Demeester authored on 2017/01/03 19:47:39Showing 2 changed files
| ... | ... |
@@ -7386,12 +7386,12 @@ LABEL a=b |
| 7386 | 7386 |
c.Assert(strings.TrimSpace(out), checker.Equals, `["sh"]`) |
| 7387 | 7387 |
} |
| 7388 | 7388 |
|
| 7389 |
-// Test case for 28902/28090 |
|
| 7389 |
+// Test case for 28902/28909 |
|
| 7390 | 7390 |
func (s *DockerSuite) TestBuildWorkdirCmd(c *check.C) {
|
| 7391 | 7391 |
testRequires(c, DaemonIsLinux) |
| 7392 | 7392 |
|
| 7393 | 7393 |
dockerFile := ` |
| 7394 |
- FROM golang:1.7-alpine |
|
| 7394 |
+ FROM busybox |
|
| 7395 | 7395 |
WORKDIR / |
| 7396 | 7396 |
` |
| 7397 | 7397 |
_, err := buildImage("testbuildworkdircmd", dockerFile, false)
|
| ... | ... |
@@ -4635,7 +4635,7 @@ func (s *delayedReader) Read([]byte) (int, error) {
|
| 4635 | 4635 |
|
| 4636 | 4636 |
// #28823 (originally #28639) |
| 4637 | 4637 |
func (s *DockerSuite) TestRunMountReadOnlyDevShm(c *check.C) {
|
| 4638 |
- testRequires(c, SameHostDaemon, DaemonIsLinux) |
|
| 4638 |
+ testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace) |
|
| 4639 | 4639 |
emptyDir, err := ioutil.TempDir("", "test-read-only-dev-shm")
|
| 4640 | 4640 |
c.Assert(err, check.IsNil) |
| 4641 | 4641 |
defer os.RemoveAll(emptyDir) |
| ... | ... |
@@ -4648,7 +4648,7 @@ func (s *DockerSuite) TestRunMountReadOnlyDevShm(c *check.C) {
|
| 4648 | 4648 |
|
| 4649 | 4649 |
// Test case for 29129 |
| 4650 | 4650 |
func (s *DockerSuite) TestRunHostnameInHostMode(c *check.C) {
|
| 4651 |
- testRequires(c, DaemonIsLinux) |
|
| 4651 |
+ testRequires(c, DaemonIsLinux, NotUserNamespace) |
|
| 4652 | 4652 |
|
| 4653 | 4653 |
expectedOutput := "foobar\nfoobar" |
| 4654 | 4654 |
out, _ := dockerCmd(c, "run", "--net=host", "--hostname=foobar", "busybox", "sh", "-c", `echo $HOSTNAME && hostname`) |