docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1957 from kacole2/improveHostnameError 

clarified hostname error with valid characters
This commit is contained in:
Nathan LeClaire 2015-10-08 16:29:45 -07:00
parent 53658e8932 3ed0377956
commit 074d7e3add
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmachine/mcnerror/errors.go
View File

@ -6,7 +6,7 @@ import (
)
var (
ErrInvalidHostname = errors.New("Invalid hostname specified")
ErrInvalidHostname = errors.New("Invalid hostname specified. Allowed hostname chars are: 0-9a-zA-Z . -")
ErrUnknownProviderType = errors.New("Unknown hypervisor type")
)

8
test/integration/cli/create-rm.bats
View File

@ -19,25 +19,25 @@ load ${BASE_TEST_DIR}/helpers.bash
run machine create -d none --url none ∞
last=$((${#lines[@]} - 1))
[ "$status" -eq 1 ]
[[ ${lines[$last]} == "Error creating machine: Invalid hostname specified" ]]
[[ ${lines[$last]} == "Error creating machine: Invalid hostname specified. Allowed hostname chars are: 0-9a-zA-Z . -" ]]
}
@test "none: create with invalid name fails 'machine create -d none --url none -'" {
run machine create -d none --url none -
[ "$status" -eq 1 ]
[[ ${lines[0]} == "Error creating machine: Invalid hostname specified" ]]
[[ ${lines[0]} == "Error creating machine: Invalid hostname specified. Allowed hostname chars are: 0-9a-zA-Z . -" ]]
}
@test "none: create with invalid name fails 'machine create -d none --url none .'" {
run machine create -d none --url none .
[ "$status" -eq 1 ]
[[ ${lines[0]} == "Error creating machine: Invalid hostname specified" ]]
[[ ${lines[0]} == "Error creating machine: Invalid hostname specified. Allowed hostname chars are: 0-9a-zA-Z . -" ]]
}
@test "none: create with invalid name fails 'machine create -d none --url none ..'" {
run machine create -d none --url none ..
[ "$status" -eq 1 ]
[[ ${lines[0]} == "Error creating machine: Invalid hostname specified" ]]
[[ ${lines[0]} == "Error creating machine: Invalid hostname specified. Allowed hostname chars are: 0-9a-zA-Z . -" ]]
}
@test "none: create with weird but valid name succeeds 'machine create -d none --url none a'" {