mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #3832 from jlhawn/3831-auth-tests-server-address
Prevent Tests from creating users on Prod Index
This commit is contained in:
commit
a446b34719
1 changed files with 17 additions and 6 deletions
|
@ -3,6 +3,7 @@ package docker
|
||||||
import (
|
import (
|
||||||
"crypto/rand"
|
"crypto/rand"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
|
"fmt"
|
||||||
"github.com/dotcloud/docker/auth"
|
"github.com/dotcloud/docker/auth"
|
||||||
"os"
|
"os"
|
||||||
"strings"
|
"strings"
|
||||||
|
@ -17,7 +18,12 @@ import (
|
||||||
func TestLogin(t *testing.T) {
|
func TestLogin(t *testing.T) {
|
||||||
os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")
|
os.Setenv("DOCKER_INDEX_URL", "https://indexstaging-docker.dotcloud.com")
|
||||||
defer os.Setenv("DOCKER_INDEX_URL", "")
|
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)
|
status, err := auth.Login(authConfig, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
@ -28,8 +34,6 @@ func TestLogin(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateAccount(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)
|
tokenBuffer := make([]byte, 16)
|
||||||
_, err := rand.Read(tokenBuffer)
|
_, err := rand.Read(tokenBuffer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -37,13 +41,20 @@ func TestCreateAccount(t *testing.T) {
|
||||||
}
|
}
|
||||||
token := hex.EncodeToString(tokenBuffer)[:12]
|
token := hex.EncodeToString(tokenBuffer)[:12]
|
||||||
username := "ut" + token
|
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)
|
status, err := auth.Login(authConfig, nil)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
expectedStatus := "Account created. Please use the confirmation link we sent" +
|
expectedStatus := fmt.Sprintf(
|
||||||
" to your e-mail to activate it."
|
"Account created. Please see the documentation of the registry %s for instructions how to activate it.",
|
||||||
|
authConfig.ServerAddress,
|
||||||
|
)
|
||||||
if status != expectedStatus {
|
if status != expectedStatus {
|
||||||
t.Fatalf("Expected status: \"%s\", found \"%s\" instead.", expectedStatus, status)
|
t.Fatalf("Expected status: \"%s\", found \"%s\" instead.", expectedStatus, status)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue