docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename TestVolumeWithSymlink to TestCreateVolumeWithSymlink and remove run_tests folder 

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
This commit is contained in:
Tibor Vass 2014-05-27 14:54:38 -07:00
parent c4c92e66cd
commit def86d0cf4
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
integration-cli/docker_cli_run_test.go
View File

@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"os" "os"
"os/exec" "os/exec"
"path/filepath"
"reflect" "reflect"
"regexp" "regexp"
"sort" "sort"
@ -444,29 +443,30 @@ func TestCreateVolume(t *testing.T) {
// Test that creating a volume with a symlink in its path works correctly. Test for #5152. // Test that creating a volume with a symlink in its path works correctly. Test for #5152.
// Note that this bug happens only with symlinks with a target that starts with '/'. // Note that this bug happens only with symlinks with a target that starts with '/'.
func TestVolumeWithSymlink(t *testing.T) { func TestCreateVolumeWithSymlink(t *testing.T) {
buildDirectory := filepath.Join(workingDirectory, "run_tests", "TestVolumeWithSymlink") buildCmd := exec.Command(dockerBinary, "build", "-t", "docker-test-createvolumewithsymlink", "-")
buildCmd := exec.Command(dockerBinary, "build", "-t", "docker-test-volumewithsymlink", ".") buildCmd.Stdin = strings.NewReader(`FROM busybox
buildCmd.Dir = buildDirectory RUN mkdir /foo && ln -s /foo /bar`)
buildCmd.Dir = workingDirectory
err := buildCmd.Run() err := buildCmd.Run()
if err != nil { if err != nil {
t.Fatalf("could not build 'docker-test-volumewithsymlink': %v", err) t.Fatalf("could not build 'docker-test-createvolumewithsymlink': %v", err)
} }
cmd := exec.Command(dockerBinary, "run", "-v", "/bar/foo", "--name", "test-volumewithsymlink", "docker-test-volumewithsymlink", "sh", "-c", "mount | grep -q /foo/foo") cmd := exec.Command(dockerBinary, "run", "-v", "/bar/foo", "--name", "test-createvolumewithsymlink", "docker-test-createvolumewithsymlink", "sh", "-c", "mount | grep -q /foo/foo")
exitCode, err := runCommand(cmd) exitCode, err := runCommand(cmd)
if err != nil || exitCode != 0 { if err != nil || exitCode != 0 {
t.Fatalf("[run] err: %v, exitcode: %d", err, exitCode) t.Fatalf("[run] err: %v, exitcode: %d", err, exitCode)
} }
var volPath string var volPath string
cmd = exec.Command(dockerBinary, "inspect", "-f", "{{range .Volumes}}{{.}}{{end}}", "test-volumewithsymlink") cmd = exec.Command(dockerBinary, "inspect", "-f", "{{range .Volumes}}{{.}}{{end}}", "test-createvolumewithsymlink")
volPath, exitCode, err = runCommandWithOutput(cmd) volPath, exitCode, err = runCommandWithOutput(cmd)
if err != nil || exitCode != 0 { if err != nil || exitCode != 0 {
t.Fatalf("[inspect] err: %v, exitcode: %d", err, exitCode) t.Fatalf("[inspect] err: %v, exitcode: %d", err, exitCode)
} }
cmd = exec.Command(dockerBinary, "rm", "-v", "test-volumewithsymlink") cmd = exec.Command(dockerBinary, "rm", "-v", "test-createvolumewithsymlink")
exitCode, err = runCommand(cmd) exitCode, err = runCommand(cmd)
if err != nil || exitCode != 0 { if err != nil || exitCode != 0 {
t.Fatalf("[rm] err: %v, exitcode: %d", err, exitCode) t.Fatalf("[rm] err: %v, exitcode: %d", err, exitCode)
@ -478,10 +478,10 @@ func TestVolumeWithSymlink(t *testing.T) {
t.Fatalf("[open] (expecting 'file does not exist' error) err: %v, volPath: %s", err, volPath) t.Fatalf("[open] (expecting 'file does not exist' error) err: %v, volPath: %s", err, volPath)
} }
deleteImages("docker-test-volumewithsymlink") deleteImages("docker-test-createvolumewithsymlink")
deleteAllContainers() deleteAllContainers()
logDone("run - volume with symlink") logDone("run - create volume with symlink")
} }
// Tests that a volume path that has a symlink exists in a container mounting it with `--volumes-from`. // Tests that a volume path that has a symlink exists in a container mounting it with `--volumes-from`.

3
integration-cli/run_tests/TestVolumeWithSymlink/Dockerfile
View File

@ -1,3 +0,0 @@
FROM busybox
RUN mkdir /foo && ln -s /foo /bar