|
@@ -3,30 +3,28 @@ package main
|
|
import (
|
|
import (
|
|
"fmt"
|
|
"fmt"
|
|
"os/exec"
|
|
"os/exec"
|
|
|
|
+ "strings"
|
|
"testing"
|
|
"testing"
|
|
|
|
+ "time"
|
|
)
|
|
)
|
|
|
|
|
|
-// these tests need a freshly started empty private docker registry
|
|
|
|
-
|
|
|
|
// pulling an image from the central registry should work
|
|
// pulling an image from the central registry should work
|
|
func TestPushBusyboxImage(t *testing.T) {
|
|
func TestPushBusyboxImage(t *testing.T) {
|
|
- reg, err := newTestRegistryV2(t)
|
|
|
|
- if err != nil {
|
|
|
|
- t.Fatal(err)
|
|
|
|
- }
|
|
|
|
- defer reg.Close()
|
|
|
|
- repoName := fmt.Sprintf("%v/dockercli/busybox", reg.URL)
|
|
|
|
|
|
+ defer setupRegistry(t)()
|
|
|
|
+
|
|
|
|
+ repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
|
|
// tag the image to upload it tot he private registry
|
|
// tag the image to upload it tot he private registry
|
|
tagCmd := exec.Command(dockerBinary, "tag", "busybox", repoName)
|
|
tagCmd := exec.Command(dockerBinary, "tag", "busybox", repoName)
|
|
if out, _, err := runCommandWithOutput(tagCmd); err != nil {
|
|
if out, _, err := runCommandWithOutput(tagCmd); err != nil {
|
|
t.Fatalf("image tagging failed: %s, %v", out, err)
|
|
t.Fatalf("image tagging failed: %s, %v", out, err)
|
|
}
|
|
}
|
|
defer deleteImages(repoName)
|
|
defer deleteImages(repoName)
|
|
|
|
+
|
|
pushCmd := exec.Command(dockerBinary, "push", repoName)
|
|
pushCmd := exec.Command(dockerBinary, "push", repoName)
|
|
if out, _, err := runCommandWithOutput(pushCmd); err != nil {
|
|
if out, _, err := runCommandWithOutput(pushCmd); err != nil {
|
|
t.Fatalf("pushing the image to the private registry has failed: %s, %v", out, err)
|
|
t.Fatalf("pushing the image to the private registry has failed: %s, %v", out, err)
|
|
}
|
|
}
|
|
- logDone("push - push busybox to private registry")
|
|
|
|
|
|
+ logDone("push - busybox to private registry")
|
|
}
|
|
}
|
|
|
|
|
|
// pushing an image without a prefix should throw an error
|
|
// pushing an image without a prefix should throw an error
|
|
@@ -35,5 +33,50 @@ func TestPushUnprefixedRepo(t *testing.T) {
|
|
if out, _, err := runCommandWithOutput(pushCmd); err == nil {
|
|
if out, _, err := runCommandWithOutput(pushCmd); err == nil {
|
|
t.Fatalf("pushing an unprefixed repo didn't result in a non-zero exit status: %s", out)
|
|
t.Fatalf("pushing an unprefixed repo didn't result in a non-zero exit status: %s", out)
|
|
}
|
|
}
|
|
- logDone("push - push unprefixed busybox repo --> must fail")
|
|
|
|
|
|
+ logDone("push - unprefixed busybox repo must fail")
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+func TestPushUntagged(t *testing.T) {
|
|
|
|
+ defer setupRegistry(t)()
|
|
|
|
+
|
|
|
|
+ repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
|
|
|
|
+
|
|
|
|
+ expected := "does not exist"
|
|
|
|
+ pushCmd := exec.Command(dockerBinary, "push", repoName)
|
|
|
|
+ if out, _, err := runCommandWithOutput(pushCmd); err == nil {
|
|
|
|
+ t.Fatalf("pushing the image to the private registry should have failed: outuput %q", out)
|
|
|
|
+ } else if !strings.Contains(out, expected) {
|
|
|
|
+ t.Fatalf("pushing the image failed with an unexpected message: expected %q, got %q", expected, out)
|
|
|
|
+ }
|
|
|
|
+ logDone("push - untagged image")
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+func TestPushInterrupt(t *testing.T) {
|
|
|
|
+ defer setupRegistry(t)()
|
|
|
|
+
|
|
|
|
+ repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
|
|
|
|
+ // tag the image to upload it tot he private registry
|
|
|
|
+ tagCmd := exec.Command(dockerBinary, "tag", "busybox", repoName)
|
|
|
|
+ if out, _, err := runCommandWithOutput(tagCmd); err != nil {
|
|
|
|
+ t.Fatalf("image tagging failed: %s, %v", out, err)
|
|
|
|
+ }
|
|
|
|
+ defer deleteImages(repoName)
|
|
|
|
+
|
|
|
|
+ pushCmd := exec.Command(dockerBinary, "push", repoName)
|
|
|
|
+ if err := pushCmd.Start(); err != nil {
|
|
|
|
+ t.Fatalf("Failed to start pushing to private registry: %v", err)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Interrupt push (yes, we have no idea at what point it will get killed).
|
|
|
|
+ time.Sleep(200 * time.Millisecond)
|
|
|
|
+ if err := pushCmd.Process.Kill(); err != nil {
|
|
|
|
+ t.Fatalf("Failed to kill push process: %v", err)
|
|
|
|
+ }
|
|
|
|
+ // Try agin
|
|
|
|
+ pushCmd = exec.Command(dockerBinary, "push", repoName)
|
|
|
|
+ if err := pushCmd.Start(); err != nil {
|
|
|
|
+ t.Fatalf("Failed to start pushing to private registry: %v", err)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ logDone("push - interrupted")
|
|
}
|
|
}
|