| ... | ... |
@@ -26,7 +26,7 @@ func TestEncodeAuth(t *testing.T) {
|
| 26 | 26 |
} |
| 27 | 27 |
} |
| 28 | 28 |
|
| 29 |
-func TestLogin(t* testing.T) {
|
|
| 29 |
+func TestLogin(t *testing.T) {
|
|
| 30 | 30 |
os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")
|
| 31 | 31 |
defer os.Setenv("DOCKER_INDEX_URL", "")
|
| 32 | 32 |
authConfig := NewAuthConfig("unittester", "surlautrerivejetattendrai", "noise+unittester@dotcloud.com", "/tmp")
|
| ... | ... |
@@ -39,7 +39,7 @@ func TestLogin(t* testing.T) {
|
| 39 | 39 |
} |
| 40 | 40 |
} |
| 41 | 41 |
|
| 42 |
-func TestCreateAccount(t* testing.T) {
|
|
| 42 |
+func TestCreateAccount(t *testing.T) {
|
|
| 43 | 43 |
os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")
|
| 44 | 44 |
defer os.Setenv("DOCKER_INDEX_URL", "")
|
| 45 | 45 |
tokenBuffer := make([]byte, 16) |
| ... | ... |
@@ -49,7 +49,7 @@ func TestCreateAccount(t* testing.T) {
|
| 49 | 49 |
} |
| 50 | 50 |
token := hex.EncodeToString(tokenBuffer)[:12] |
| 51 | 51 |
username := "ut" + token |
| 52 |
- authConfig := NewAuthConfig(username, "test42", "docker-ut+" + token + "@example.com", "/tmp") |
|
| 52 |
+ authConfig := NewAuthConfig(username, "test42", "docker-ut+"+token+"@example.com", "/tmp") |
|
| 53 | 53 |
status, err := Login(authConfig) |
| 54 | 54 |
if err != nil {
|
| 55 | 55 |
t.Fatal(err) |
| ... | ... |
@@ -70,4 +70,4 @@ func TestCreateAccount(t* testing.T) {
|
| 70 | 70 |
if !strings.Contains(err.Error(), expectedError) {
|
| 71 | 71 |
t.Fatalf("Expected message \"%s\" but found \"%s\" instead", expectedError, err.Error())
|
| 72 | 72 |
} |
| 73 |
-} |
|
| 74 | 73 |
\ No newline at end of file |
| 74 |
+} |
| ... | ... |
@@ -691,7 +691,6 @@ func (graph *Graph) PushRepository(stdout io.Writer, remote string, localRepo Re |
| 691 | 691 |
} |
| 692 | 692 |
} |
| 693 | 693 |
|
| 694 |
- |
|
| 695 | 694 |
req2, err := http.NewRequest("PUT", auth.IndexServerAddress()+"/repositories/"+remote+"/images", bytes.NewReader(imgListJson))
|
| 696 | 695 |
if err != nil {
|
| 697 | 696 |
return err |
| ... | ... |
@@ -9,7 +9,7 @@ import ( |
| 9 | 9 |
"testing" |
| 10 | 10 |
) |
| 11 | 11 |
|
| 12 |
-func TestPull(t* testing.T) {
|
|
| 12 |
+func TestPull(t *testing.T) {
|
|
| 13 | 13 |
runtime, err := newTestRuntime() |
| 14 | 14 |
if err != nil {
|
| 15 | 15 |
t.Fatal(err) |
| ... | ... |
@@ -45,7 +45,7 @@ func TestPull(t* testing.T) {
|
| 45 | 45 |
} |
| 46 | 46 |
} |
| 47 | 47 |
|
| 48 |
-func TestPullTag(t* testing.T) {
|
|
| 48 |
+func TestPullTag(t *testing.T) {
|
|
| 49 | 49 |
runtime, err := newTestRuntime() |
| 50 | 50 |
if err != nil {
|
| 51 | 51 |
t.Fatal(err) |
| ... | ... |
@@ -74,7 +74,7 @@ func login(runtime *Runtime) error {
|
| 74 | 74 |
return err |
| 75 | 75 |
} |
| 76 | 76 |
|
| 77 |
-func TestPush(t* testing.T) {
|
|
| 77 |
+func TestPush(t *testing.T) {
|
|
| 78 | 78 |
os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")
|
| 79 | 79 |
defer os.Setenv("DOCKER_INDEX_URL", "")
|
| 80 | 80 |
runtime, err := newTestRuntime() |
| ... | ... |
@@ -116,13 +116,13 @@ func TestPush(t* testing.T) {
|
| 116 | 116 |
t.Fatalf("Expected status code 0, found %d instead", status)
|
| 117 | 117 |
} |
| 118 | 118 |
|
| 119 |
- img, err := b.Commit(container, "unittester/" + token, "", "", "", nil) |
|
| 119 |
+ img, err := b.Commit(container, "unittester/"+token, "", "", "", nil) |
|
| 120 | 120 |
if err != nil {
|
| 121 | 121 |
t.Fatal(err) |
| 122 | 122 |
} |
| 123 | 123 |
|
| 124 | 124 |
repo := runtime.repositories.Repositories["unittester/"+token] |
| 125 |
- err = runtime.graph.PushRepository(os.Stdout, "unittester/" + token, repo, runtime.authConfig) |
|
| 125 |
+ err = runtime.graph.PushRepository(os.Stdout, "unittester/"+token, repo, runtime.authConfig) |
|
| 126 | 126 |
if err != nil {
|
| 127 | 127 |
t.Fatal(err) |
| 128 | 128 |
} |
| ... | ... |
@@ -132,7 +132,7 @@ func TestPush(t* testing.T) {
|
| 132 | 132 |
t.Fatal(err) |
| 133 | 133 |
} |
| 134 | 134 |
|
| 135 |
- err = runtime.graph.PullRepository(os.Stdout, "unittester/" + token, "", runtime.repositories, runtime.authConfig) |
|
| 135 |
+ err = runtime.graph.PullRepository(os.Stdout, "unittester/"+token, "", runtime.repositories, runtime.authConfig) |
|
| 136 | 136 |
if err != nil {
|
| 137 | 137 |
t.Fatal(err) |
| 138 | 138 |
} |
| ... | ... |
@@ -145,4 +145,4 @@ func TestPush(t* testing.T) {
|
| 145 | 145 |
if _, err := os.Stat(path.Join(layerPath, token)); err != nil {
|
| 146 | 146 |
t.Fatalf("Error while trying to retrieve token file: %v", err)
|
| 147 | 147 |
} |
| 148 |
-} |
|
| 149 | 148 |
\ No newline at end of file |
| 149 |
+} |