1. docker
  2. Commit 0dc7bdc32531e29d9578a28f012361259d7f8a0a
Browse code

Adjust tests for changes in Go 1.12.8 / 1.11.13

```
00:38:11 === Failed
00:38:11 === FAIL: opts TestParseDockerDaemonHost (0.00s)
00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d address expected error "Invalid bind address format: tcp:a.b.c.d" return, got "parse tcp://tcp:a.b.c.d: invalid port \":a.b.c.d\" after host" and addr
00:38:11 hosts_test.go:87: tcp tcp:a.b.c.d/path address expected error "Invalid bind address format: tcp:a.b.c.d/path" return, got "parse tcp://tcp:a.b.c.d/path: invalid port \":a.b.c.d\" after host" and addr
00:38:11
00:38:11 === FAIL: opts TestParseTCP (0.00s)
00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d address expected error Invalid bind address format: tcp:a.b.c.d return, got parse tcp://tcp:a.b.c.d: invalid port ":a.b.c.d" after host and addr
00:38:11 hosts_test.go:129: tcp tcp:a.b.c.d/path address expected error Invalid bind address format: tcp:a.b.c.d/path return, got parse tcp://tcp:a.b.c.d/path: invalid port ":a.b.c.d" after host and addr
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 683766613a8c1dca8f95b19ddb7e083bb3aef266)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/08/14 09:51:08
Showing 1 changed files
opts/hosts_test.go
History View file @ 0dc7bdc
... ... 
@@ -53,8 +53,8 @@ func TestParseHost(t *testing.T) {
53 53 
 func TestParseDockerDaemonHost(t *testing.T) {
54 54 
 	invalids := map[string]string{
55 55
56 
-		"tcp:a.b.c.d":                   "Invalid bind address format: tcp:a.b.c.d",
57 
-		"tcp:a.b.c.d/path":              "Invalid bind address format: tcp:a.b.c.d/path",
56 
+		"tcp:a.b.c.d":                   "",
57 
+		"tcp:a.b.c.d/path":              "",
58 58 
 		"udp://127.0.0.1":               "Invalid bind address format: udp://127.0.0.1",
59 59 
 		"udp://127.0.0.1:2375":          "Invalid bind address format: udp://127.0.0.1:2375",
60 60 
 		"tcp://unix:///run/docker.sock": "Invalid proto, expected tcp: unix:///run/docker.sock",
... ... 
@@ -83,7 +83,7 @@ func TestParseDockerDaemonHost(t *testing.T) {
83 83 
 		"localhost:5555/path":         "tcp://localhost:5555/path",
84 84 
 	}
85 85 
 	for invalidAddr, expectedError := range invalids {
86 
-		if addr, err := parseDaemonHost(invalidAddr); err == nil || err.Error() != expectedError {
86 
+		if addr, err := parseDaemonHost(invalidAddr); err == nil || expectedError != "" && err.Error() != expectedError {
87 87 
 			t.Errorf("tcp %v address expected error %q return, got %q and addr %v", invalidAddr, expectedError, err, addr)
88 88 
 		}
89 89 
 	}
... ... 
@@ -99,8 +99,8 @@ func TestParseTCP(t *testing.T) {
99 99 
 		defaultHTTPHost = "tcp://127.0.0.1:2376"
100 100 
 	)
101 101 
 	invalids := map[string]string{
102 
-		"tcp:a.b.c.d":          "Invalid bind address format: tcp:a.b.c.d",
103 
-		"tcp:a.b.c.d/path":     "Invalid bind address format: tcp:a.b.c.d/path",
102 
+		"tcp:a.b.c.d":          "",
103 
+		"tcp:a.b.c.d/path":     "",
104 104 
 		"udp://127.0.0.1":      "Invalid proto, expected tcp: udp://127.0.0.1",
105 105 
 		"udp://127.0.0.1:2375": "Invalid proto, expected tcp: udp://127.0.0.1:2375",
106 106 
 	}
... ... 
@@ -125,7 +125,7 @@ func TestParseTCP(t *testing.T) {
125 125 
 		"localhost:5555/path":         "tcp://localhost:5555/path",
126 126 
 	}
127 127 
 	for invalidAddr, expectedError := range invalids {
128 
-		if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || err.Error() != expectedError {
128 
+		if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || expectedError != "" && err.Error() != expectedError {
129 129 
 			t.Errorf("tcp %v address expected error %v return, got %s and addr %v", invalidAddr, expectedError, err, addr)
130 130 
 		}
131 131 
 	}