p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent Tests from creating users on Prod Index

Browse Source 
The integration tests had previously used the environment variable
DOCKER_INDEX_URL but it was apparently removed several months ago.

Change the integration auth tests to specify the ServerAddress field
of the AuthConfig struct to use the staging deployment of the index.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: c914abaf15634d8039927176dfc5ff3c765f30d0
Component: engine
This commit is contained in:
Josh Hawn
2014-01-29 16:49:42 -08:00
parent 91a0b7d691
commit a56f23222b
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
components/engine/integration/auth_test.go
View File

@ -3,6 +3,7 @@ package docker
import (
"crypto/rand"
"encoding/hex"
"fmt"
"github.com/dotcloud/docker/auth"
"os"
"strings"
@ -17,7 +18,12 @@ import (
func TestLogin(t *testing.T) {
os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")
defer os.Setenv("DOCKER_INDEX_URL", "")
authConfig := &auth.AuthConfig{Username: "unittester", Password: "surlautrerivejetattendrai", Email: "noise+unittester@dotcloud.com"}
authConfig := &auth.AuthConfig{
Username: "unittester",
Password: "surlautrerivejetattendrai",
Email: "noise+unittester@docker.com",
ServerAddress: "https://indexstaging-docker.dotcloud.com/v1/",
}
status, err := auth.Login(authConfig, nil)
if err != nil {
t.Fatal(err)
@ -28,8 +34,6 @@ func TestLogin(t *testing.T) {
}
func TestCreateAccount(t *testing.T) {
os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")
defer os.Setenv("DOCKER_INDEX_URL", "")
tokenBuffer := make([]byte, 16)
_, err := rand.Read(tokenBuffer)
if err != nil {
@ -37,13 +41,20 @@ func TestCreateAccount(t *testing.T) {
}
token := hex.EncodeToString(tokenBuffer)[:12]
username := "ut" + token
authConfig := &auth.AuthConfig{Username: username, Password: "test42", Email: "docker-ut+" + token + "@example.com"}
authConfig := &auth.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)
if err != nil {
t.Fatal(err)
}
expectedStatus := "Account created. Please use the confirmation link we sent" +
" to your e-mail to activate it."
expectedStatus := fmt.Sprintf(
"Account created. Please see the documentation of the registry %s for instructions how to activate it.",
authConfig.ServerAddress,
)
if status != expectedStatus {
t.Fatalf("Expected status: \"%s\", found \"%s\" instead.", expectedStatus, status)
}