p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14979 from runcom/fix-flacky-TestRunNonRootUserResolvName

Browse Source 
Fix TestRunNonRootUserResolvName flackiness
Upstream-commit: afb831d35e62139c9e7a214a471c3dd956076223
Component: engine
This commit is contained in:
Tibor Vass
2015-07-24 21:50:44 -04:00
parent 32e08b641b 6a640c48bd
commit abb442b01d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/integration-cli/docker_cli_run_test.go
View File

@ -1034,10 +1034,9 @@ func (s *DockerSuite) TestRunDnsOptionsBasedOnHostResolvConf(c *check.C) {
// Test to see if a non-root user can resolve a DNS name and reach out to it. Also
// check if the container resolv.conf file has atleast 0644 perm.
func (s *DockerSuite) TestRunNonRootUserResolvName(c *check.C) {
testRequires(c, SameHostDaemon, NativeExecDriver)
testRequires(c, Network)
testRequires(c, SameHostDaemon, Network)
dockerCmd(c, "run", "--name=testperm", "--user=default", "busybox", "ping", "-c", "1", "www.docker.io")
dockerCmd(c, "run", "--name=testperm", "--user=default", "busybox", "ping", "-c", "1", "apt.dockerproject.org")
cID, err := getIDByName("testperm")
if err != nil {