mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Upgrade Go to 1.6.
Signed-off-by: David Calavera <david.calavera@gmail.com>
This commit is contained in:
parent
776c5ee299
commit
14d5c91d87
2 changed files with 14 additions and 12 deletions
|
@ -116,7 +116,7 @@ RUN set -x \
|
|||
# IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
|
||||
# will need updating, to avoid errors. Ping #docker-maintainers on IRC
|
||||
# with a heads-up.
|
||||
ENV GO_VERSION 1.5.3
|
||||
ENV GO_VERSION 1.6
|
||||
RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" \
|
||||
| tar -xzC /usr/local
|
||||
ENV PATH /go/bin:/usr/local/go/bin:$PATH
|
||||
|
|
|
@ -6,15 +6,16 @@ import (
|
|||
)
|
||||
|
||||
func TestParseHost(t *testing.T) {
|
||||
invalid := map[string]string{
|
||||
"anything": "Invalid bind address format: anything",
|
||||
"something with spaces": "Invalid bind address format: something with spaces",
|
||||
"://": "Invalid bind address format: ://",
|
||||
"unknown://": "Invalid bind address format: unknown://",
|
||||
"tcp://:port": "Invalid bind address format: :port",
|
||||
"tcp://invalid": "Invalid bind address format: invalid",
|
||||
"tcp://invalid:port": "Invalid bind address format: invalid:port",
|
||||
invalid := []string{
|
||||
"anything",
|
||||
"something with spaces",
|
||||
"://",
|
||||
"unknown://",
|
||||
"tcp://:port",
|
||||
"tcp://invalid",
|
||||
"tcp://invalid:port",
|
||||
}
|
||||
|
||||
valid := map[string]string{
|
||||
"": DefaultHost,
|
||||
" ": DefaultHost,
|
||||
|
@ -37,11 +38,12 @@ func TestParseHost(t *testing.T) {
|
|||
"npipe:////./pipe/foo": "npipe:////./pipe/foo",
|
||||
}
|
||||
|
||||
for value, errorMessage := range invalid {
|
||||
if _, err := ParseHost(false, value); err == nil || err.Error() != errorMessage {
|
||||
t.Errorf("Expected an error for %v with [%v], got [%v]", value, errorMessage, err)
|
||||
for _, value := range invalid {
|
||||
if _, err := ParseHost(false, value); err == nil {
|
||||
t.Errorf("Expected an error for %v, got [nil]", value)
|
||||
}
|
||||
}
|
||||
|
||||
for value, expected := range valid {
|
||||
if actual, err := ParseHost(false, value); err != nil || actual != expected {
|
||||
t.Errorf("Expected for %v [%v], got [%v, %v]", value, expected, actual, err)
|
||||
|
|
Loading…
Reference in a new issue