kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Remove stripTrailingCharacters from tests

Browse source 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This commit is contained in:
Brian Goff 2015-04-06 09:21:18 -04:00
parent a73b7354a6
commit 475c65319b
31 changed files with 130 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

12
integration-cli/docker_cli_commit_test.go
View file

@ -13,7 +13,7 @@ func TestCommitAfterContainerIsDone(t *testing.T) {
t.Fatalf("failed to run container: %s, %v", out, err)
}
cleanedContainerID := stripTrailingCharacters(out)
cleanedContainerID := strings.TrimSpace(out)
waitCmd := exec.Command(dockerBinary, "wait", cleanedContainerID)
if _, _, err = runCommandWithOutput(waitCmd); err != nil {
@ -26,7 +26,7 @@ func TestCommitAfterContainerIsDone(t *testing.T) {
t.Fatalf("failed to commit container to image: %s, %v", out, err)
}
cleanedImageID := stripTrailingCharacters(out)
cleanedImageID := strings.TrimSpace(out)
inspectCmd := exec.Command(dockerBinary, "inspect", cleanedImageID)
if out, _, err = runCommandWithOutput(inspectCmd); err != nil {
@ -46,7 +46,7 @@ func TestCommitWithoutPause(t *testing.T) {
t.Fatalf("failed to run container: %s, %v", out, err)
}
cleanedContainerID := stripTrailingCharacters(out)
cleanedContainerID := strings.TrimSpace(out)
waitCmd := exec.Command(dockerBinary, "wait", cleanedContainerID)
if _, _, err = runCommandWithOutput(waitCmd); err != nil {
@ -59,7 +59,7 @@ func TestCommitWithoutPause(t *testing.T) {
t.Fatalf("failed to commit container to image: %s, %v", out, err)
}
cleanedImageID := stripTrailingCharacters(out)
cleanedImageID := strings.TrimSpace(out)
inspectCmd := exec.Command(dockerBinary, "inspect", cleanedImageID)
if out, _, err = runCommandWithOutput(inspectCmd); err != nil {
@ -82,7 +82,7 @@ func TestCommitPausedContainer(t *testing.T) {
t.Fatalf("failed to run container: %v, output: %q", err, out)
}
cleanedContainerID := stripTrailingCharacters(out)
cleanedContainerID := strings.TrimSpace(out)
cmd = exec.Command(dockerBinary, "pause", cleanedContainerID)
out, _, _, err = runCommandWithStdoutStderr(cmd)
if err != nil {
@ -94,7 +94,7 @@ func TestCommitPausedContainer(t *testing.T) {
if err != nil {
t.Fatalf("failed to commit container to image: %s, %v", out, err)
}
cleanedImageID := stripTrailingCharacters(out)
cleanedImageID := strings.TrimSpace(out)
defer deleteImages(cleanedImageID)
cmd = exec.Command(dockerBinary, "inspect", "-f", "{{.State.Paused}}", cleanedContainerID)