summaryrefslogtreecommitdiff
path: root/integration/auth_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'integration/auth_test.go')
-rw-r--r--integration/auth_test.go14
1 files changed, 8 insertions, 6 deletions
diff --git a/integration/auth_test.go b/integration/auth_test.go
index c5bdabace2..8109bbb130 100644
--- a/integration/auth_test.go
+++ b/integration/auth_test.go
@@ -4,7 +4,7 @@ import (
"crypto/rand"
"encoding/hex"
"fmt"
- "github.com/dotcloud/docker/auth"
+ "github.com/dotcloud/docker/registry"
"os"
"strings"
"testing"
@@ -16,15 +16,16 @@ import (
// - Integration tests should have side-effects limited to the host environment being tested.
func TestLogin(t *testing.T) {
+ t.Skip("FIXME: please remove dependency on external services")
os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")
defer os.Setenv("DOCKER_INDEX_URL", "")
- authConfig := &auth.AuthConfig{
+ authConfig := &registry.AuthConfig{
Username: "unittester",
Password: "surlautrerivejetattendrai",
Email: "noise+unittester@docker.com",
ServerAddress: "https://indexstaging-docker.dotcloud.com/v1/",
}
- status, err := auth.Login(authConfig, nil)
+ status, err := registry.Login(authConfig, nil)
if err != nil {
t.Fatal(err)
}
@@ -34,6 +35,7 @@ func TestLogin(t *testing.T) {
}
func TestCreateAccount(t *testing.T) {
+ t.Skip("FIXME: please remove dependency on external services")
tokenBuffer := make([]byte, 16)
_, err := rand.Read(tokenBuffer)
if err != nil {
@@ -41,13 +43,13 @@ func TestCreateAccount(t *testing.T) {
}
token := hex.EncodeToString(tokenBuffer)[:12]
username := "ut" + token
- authConfig := &auth.AuthConfig{
+ authConfig := &registry.AuthConfig{
Username: username,
Password: "test42",
Email: fmt.Sprintf("docker-ut+%s@example.com", token),
ServerAddress: "https://indexstaging-docker.dotcloud.com/v1/",
}
- status, err := auth.Login(authConfig, nil)
+ status, err := registry.Login(authConfig, nil)
if err != nil {
t.Fatal(err)
}
@@ -59,7 +61,7 @@ func TestCreateAccount(t *testing.T) {
t.Fatalf("Expected status: \"%s\", found \"%s\" instead.", expectedStatus, status)
}
- status, err = auth.Login(authConfig, nil)
+ status, err = registry.Login(authConfig, nil)
if err == nil {
t.Fatalf("Expected error but found nil instead")
}