starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-09-24 07:25:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix vet errors

Browse Source 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 18d9f1978b311ff9cadce9f0237313db14502f9f
Component: engine
This commit is contained in:
Alexandr Morozov
2014-11-05 08:26:22 -08:00
parent 458ef2c326
commit 07c8c2eea7
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_build_test.go
+4 -4
View File
@@ -218,7 +218,7 @@ func TestBuildEnvironmentReplacementEnv(t *testing.T) {
if parts[0] == "bar" {
found = true
if parts[1] != "foo" {
t.Fatal("Could not find replaced var for env `bar`: got %q instead of `foo`", parts[1])
t.Fatalf("Could not find replaced var for env `bar`: got %q instead of `foo`", parts[1])
}
}
}
@@ -1224,7 +1224,7 @@ func TestBuildCopyDisallowRemote(t *testing.T) {
COPY https://index.docker.io/robots.txt /`,
true)
if err == nil || !strings.Contains(out, "Source can't be a URL for COPY") {
t.Fatal("Error should be about disallowed remote source, got err: %s, out: %q", err, out)
t.Fatalf("Error should be about disallowed remote source, got err: %s, out: %q", err, out)
}
logDone("build - copy - disallow copy from remote")
}
@@ -1374,7 +1374,7 @@ func TestBuildForceRm(t *testing.T) {
buildCmd := exec.Command(dockerBinary, "build", "-t", name, "--force-rm", ".")
buildCmd.Dir = ctx.Dir
if out, _, err := runCommandWithOutput(buildCmd); err == nil {
t.Fatal("failed to build the image: %s, %v", out, err)
t.Fatalf("failed to build the image: %s, %v", out, err)
}
containerCountAfter, err := getContainerCount()
@@ -3181,7 +3181,7 @@ func TestBuildEntrypointInheritance(t *testing.T) {
status, _ = runCommand(exec.Command(dockerBinary, "run", "child"))
if status != 5 {
t.Fatal("expected exit code 5 but received %d", status)
t.Fatalf("expected exit code 5 but received %d", status)
}
logDone("build - clear entrypoint")