kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #29827 from vdemeester/integration-fixes-for-userns 

Updates some integration tests to fix userns builds
This commit is contained in:
Vincent Demeester 2017-01-03 11:47:39 +01:00 committed by GitHub
parent 275d68ab39 bc19388fb2
commit de709ebfd8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
integration-cli/docker_cli_build_test.go
View File

@ -7386,12 +7386,12 @@ LABEL a=b
c.Assert(strings.TrimSpace(out), checker.Equals, `["sh"]`)
}
// Test case for 28902/28090
// Test case for 28902/28909
func (s *DockerSuite) TestBuildWorkdirCmd(c *check.C) {
testRequires(c, DaemonIsLinux)
dockerFile := `
FROM golang:1.7-alpine
FROM busybox
WORKDIR /
`
_, err := buildImage("testbuildworkdircmd", dockerFile, false)

4
integration-cli/docker_cli_run_test.go
View File

@ -4635,7 +4635,7 @@ func (s *delayedReader) Read([]byte) (int, error) {
// #28823 (originally #28639)
func (s *DockerSuite) TestRunMountReadOnlyDevShm(c *check.C) {
testRequires(c, SameHostDaemon, DaemonIsLinux)
testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
emptyDir, err := ioutil.TempDir("", "test-read-only-dev-shm")
c.Assert(err, check.IsNil)
defer os.RemoveAll(emptyDir)
@ -4648,7 +4648,7 @@ func (s *DockerSuite) TestRunMountReadOnlyDevShm(c *check.C) {
// Test case for 29129
func (s *DockerSuite) TestRunHostnameInHostMode(c *check.C) {
testRequires(c, DaemonIsLinux)
testRequires(c, DaemonIsLinux, NotUserNamespace)
expectedOutput := "foobar\nfoobar"
out, _ := dockerCmd(c, "run", "--net=host", "--hostname=foobar", "busybox", "sh", "-c", `echo $HOSTNAME && hostname`)