beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make sure we are trying to unmount a mounted /etc/resolv.conf

Browse source 
Signed-off-by: Alvaro Saurin <alvaro.saurin@gmail.com>
(cherry picked from commit 41cc7c4d9d)
This commit is contained in:
Alvaro Saurin 2016-06-21 10:38:45 +02:00 committed by Tibor Vass
parent 3e6c39e2ee
commit c2b195d3c2
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
integration-cli/docker_cli_run_test.go
View file

@ -1448,10 +1448,16 @@ func (s *DockerSuite) TestRunResolvconfUpdate(c *check.C) {
// This test case is meant to test monitoring resolv.conf when it is
// a regular file not a bind mounc. So we unmount resolv.conf and replace
// it with a file containing the original settings.
cmd := exec.Command("umount", "/etc/resolv.conf")
if _, err = runCommand(cmd); err != nil {
mounted, err := mount.Mounted("/etc/resolv.conf")
if err != nil {
c.Fatal(err)
}
if mounted {
cmd := exec.Command("umount", "/etc/resolv.conf")
if _, err = runCommand(cmd); err != nil {
c.Fatal(err)
}
}
//cleanup
defer func() {