mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Cleanup errorOut resp in tag test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
This commit is contained in:
parent
b645df1d39
commit
475235ba7e
1 changed files with 9 additions and 5 deletions
|
@ -13,8 +13,9 @@ func TestTagUnprefixedRepoByName(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
tagCmd := exec.Command(dockerBinary, "tag", "busybox:latest", "testfoobarbaz")
|
tagCmd := exec.Command(dockerBinary, "tag", "busybox:latest", "testfoobarbaz")
|
||||||
out, _, err := runCommandWithOutput(tagCmd)
|
if out, _, err := runCommandWithOutput(tagCmd); err != nil {
|
||||||
errorOut(err, t, fmt.Sprintf("%v %v", out, err))
|
t.Fatal(out, err)
|
||||||
|
}
|
||||||
|
|
||||||
deleteImages("testfoobarbaz")
|
deleteImages("testfoobarbaz")
|
||||||
|
|
||||||
|
@ -25,12 +26,15 @@ func TestTagUnprefixedRepoByName(t *testing.T) {
|
||||||
func TestTagUnprefixedRepoByID(t *testing.T) {
|
func TestTagUnprefixedRepoByID(t *testing.T) {
|
||||||
getIDCmd := exec.Command(dockerBinary, "inspect", "-f", "{{.Id}}", "busybox")
|
getIDCmd := exec.Command(dockerBinary, "inspect", "-f", "{{.Id}}", "busybox")
|
||||||
out, _, err := runCommandWithOutput(getIDCmd)
|
out, _, err := runCommandWithOutput(getIDCmd)
|
||||||
errorOut(err, t, fmt.Sprintf("failed to get the image ID of busybox: %v", err))
|
if err != nil {
|
||||||
|
t.Fatalf("failed to get the image ID of busybox: %s, %v", out, err)
|
||||||
|
}
|
||||||
|
|
||||||
cleanedImageID := stripTrailingCharacters(out)
|
cleanedImageID := stripTrailingCharacters(out)
|
||||||
tagCmd := exec.Command(dockerBinary, "tag", cleanedImageID, "testfoobarbaz")
|
tagCmd := exec.Command(dockerBinary, "tag", cleanedImageID, "testfoobarbaz")
|
||||||
out, _, err = runCommandWithOutput(tagCmd)
|
if out, _, err = runCommandWithOutput(tagCmd); err != nil {
|
||||||
errorOut(err, t, fmt.Sprintf("%s %s", out, err))
|
t.Fatal(out, err)
|
||||||
|
}
|
||||||
|
|
||||||
deleteImages("testfoobarbaz")
|
deleteImages("testfoobarbaz")
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue