mobi/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2025-12-07 19:42:23 +03:00
Code Activity

integcli: lint fixes

Browse Source 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
This commit is contained in:
unclejack
2014-10-06 17:26:55 +03:00
parent 44264f48e4
commit c0e632246d
13 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
integration-cli/docker_cli_commit_test.go
View File

@@ -68,13 +68,13 @@ func TestCommitNewFile(t *testing.T) {
}
cmd = exec.Command(dockerBinary, "commit", "commiter")
imageId, _, err := runCommandWithOutput(cmd)
imageID, _, err := runCommandWithOutput(cmd)
if err != nil {
t.Fatal(err)
}
imageId = strings.Trim(imageId, "\r\n")
imageID = strings.Trim(imageID, "\r\n")
cmd = exec.Command(dockerBinary, "run", imageId, "cat", "/foo")
cmd = exec.Command(dockerBinary, "run", imageID, "cat", "/foo")
out, _, err := runCommandWithOutput(cmd)
if err != nil {
@@ -85,7 +85,7 @@ func TestCommitNewFile(t *testing.T) {
}
deleteAllContainers()
deleteImages(imageId)
deleteImages(imageID)
logDone("commit - commit file and read")
}
@@ -98,11 +98,11 @@ func TestCommitTTY(t *testing.T) {
}
cmd = exec.Command(dockerBinary, "commit", "tty", "ttytest")
imageId, _, err := runCommandWithOutput(cmd)
imageID, _, err := runCommandWithOutput(cmd)
if err != nil {
t.Fatal(err)
}
imageId = strings.Trim(imageId, "\r\n")
imageID = strings.Trim(imageID, "\r\n")
cmd = exec.Command(dockerBinary, "run", "ttytest", "/bin/ls")
@@ -120,11 +120,11 @@ func TestCommitWithHostBindMount(t *testing.T) {
}
cmd = exec.Command(dockerBinary, "commit", "bind-commit", "bindtest")
imageId, _, err := runCommandWithOutput(cmd)
imageID, _, err := runCommandWithOutput(cmd)
if err != nil {
t.Fatal(imageId, err)
t.Fatal(imageID, err)
}
imageId = strings.Trim(imageId, "\r\n")
imageID = strings.Trim(imageID, "\r\n")
cmd = exec.Command(dockerBinary, "run", "bindtest", "true")
@@ -133,7 +133,7 @@ func TestCommitWithHostBindMount(t *testing.T) {
}
deleteAllContainers()
deleteImages(imageId)
deleteImages(imageID)
logDone("commit - commit bind mounted file")
}