From 9e582358290e714eef5dd529a3e3acf8b99a1835 Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Thu, 5 Mar 2015 09:41:56 -0500 Subject: [PATCH] Clarify/cleanup "/etc" volume overlays special /etc mounts test Added link to original issue and clarified text so someone without any background on the original issue can understand why the test exists. Docker-DCO-1.1-Signed-off-by: Phil Estes (github: estesp) Upstream-commit: b5036ad5c64f19a52806df500b6a89d9c3294ac6 Component: engine --- .../engine/integration-cli/docker_cli_run_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_run_test.go b/components/engine/integration-cli/docker_cli_run_test.go index a94c23f6bb..76ec09f16d 100644 --- a/components/engine/integration-cli/docker_cli_run_test.go +++ b/components/engine/integration-cli/docker_cli_run_test.go @@ -2573,7 +2573,7 @@ func TestRunReuseBindVolumeThatIsSymlink(t *testing.T) { logDone("run - can remount old bindmount volume") } -//test create /etc volume +//GH#10604: Test an "/etc" volume doesn't overlay special bind mounts in container func TestRunCreateVolumeEtc(t *testing.T) { defer deleteAllContainers() @@ -2583,7 +2583,7 @@ func TestRunCreateVolumeEtc(t *testing.T) { t.Fatal("failed to run container: %v, output: %q", err, out) } if !strings.Contains(out, "nameserver 127.0.0.1") { - t.Fatal("failed: create /etc volume cover /etc/resolv.conf") + t.Fatal("/etc volume mount hides /etc/resolv.conf") } cmd = exec.Command(dockerBinary, "run", "-h=test123", "-v", "/etc", "busybox", "cat", "/etc/hostname") @@ -2592,7 +2592,7 @@ func TestRunCreateVolumeEtc(t *testing.T) { t.Fatal("failed to run container: %v, output: %q", err, out) } if !strings.Contains(out, "test123") { - t.Fatal("failed: create /etc volume cover /etc/hostname") + t.Fatal("/etc volume mount hides /etc/hostname") } cmd = exec.Command(dockerBinary, "run", "--add-host=test:192.168.0.1", "-v", "/etc", "busybox", "cat", "/etc/hosts") @@ -2601,11 +2601,11 @@ func TestRunCreateVolumeEtc(t *testing.T) { t.Fatal("failed to run container: %v, output: %q", err, out) } out = strings.Replace(out, "\n", " ", -1) - if !strings.Contains(out, "192.168.0.1"+"\t"+"test") || !strings.Contains(out, "127.0.0.1"+"\t"+"localhost") { - t.Fatal("failed: create /etc volume cover /etc/hosts", out) + if !strings.Contains(out, "192.168.0.1\ttest") || !strings.Contains(out, "127.0.0.1\tlocalhost") { + t.Fatal("/etc volume mount hides /etc/hosts") } - logDone("run - create /etc volume success") + logDone("run - verify /etc volume doesn't hide special bind mounts") } func TestVolumesNoCopyData(t *testing.T) {