dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-03 22:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix go vet errors

Browse Source 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
This commit is contained in:
LK4D4
2014-06-12 09:15:53 +04:00
committed by Victor Vieux
parent f0ec901819
commit f08cd445b0
12 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
integration-cli/docker_cli_images_test.go
View File

@@ -27,14 +27,14 @@ func TestCLIImageTagRemove(t *testing.T) {
{
imagesAfter, _, _ := cmd(t, "images", "-a")
if nLines(imagesAfter) != nLines(imagesBefore)+3 {
t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
}
}
cmd(t, "rmi", "utest/docker:tag2")
{
imagesAfter, _, _ := cmd(t, "images", "-a")
if nLines(imagesAfter) != nLines(imagesBefore)+2 {
t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
}
}
@@ -42,7 +42,7 @@ func TestCLIImageTagRemove(t *testing.T) {
{
imagesAfter, _, _ := cmd(t, "images", "-a")
if nLines(imagesAfter) != nLines(imagesBefore)+1 {
t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
}
}
@@ -50,7 +50,7 @@ func TestCLIImageTagRemove(t *testing.T) {
{
imagesAfter, _, _ := cmd(t, "images", "-a")
if nLines(imagesAfter) != nLines(imagesBefore)+0 {
t.Fatalf("before: %#s\n\nafter: %#s\n", imagesBefore, imagesAfter)
t.Fatalf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter)
}
}

10
integration-cli/docker_cli_run_test.go
View File

@@ -450,32 +450,32 @@ func TestVolumeWithSymlink(t *testing.T) {
buildCmd.Dir = buildDirectory
err := buildCmd.Run()
if err != nil {
t.Fatal("could not build 'docker-test-volumewithsymlink': %v", err)
t.Fatalf("could not build 'docker-test-volumewithsymlink': %v", err)
}
cmd := exec.Command(dockerBinary, "run", "-v", "/bar/foo", "--name", "test-volumewithsymlink", "docker-test-volumewithsymlink", "sh", "-c", "mount | grep -q /foo/foo")
exitCode, err := runCommand(cmd)
if err != nil || exitCode != 0 {
t.Fatal("[run] err: %v, exitcode: %d", err, exitCode)
t.Fatalf("[run] err: %v, exitcode: %d", err, exitCode)
}
var volPath string
cmd = exec.Command(dockerBinary, "inspect", "-f", "{{range .Volumes}}{{.}}{{end}}", "test-volumewithsymlink")
volPath, exitCode, err = runCommandWithOutput(cmd)
if err != nil || exitCode != 0 {
t.Fatal("[inspect] err: %v, exitcode: %d", err, exitCode)
t.Fatalf("[inspect] err: %v, exitcode: %d", err, exitCode)
}
cmd = exec.Command(dockerBinary, "rm", "-v", "test-volumewithsymlink")
exitCode, err = runCommand(cmd)
if err != nil || exitCode != 0 {
t.Fatal("[rm] err: %v, exitcode: %d", err, exitCode)
t.Fatalf("[rm] err: %v, exitcode: %d", err, exitCode)
}
f, err := os.Open(volPath)
defer f.Close()
if !os.IsNotExist(err) {
t.Fatal("[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")