mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3356 from xiang90/travis

Browse Source 
*: test gofmt with -s and fix reported issues
This commit is contained in:
Xiang Li
2015-08-21 18:59:51 -07:00
parent 301b7f57c0 6b23a8131f
commit 044b23c3ca
35 changed files with 266 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
pkg/netutil/netutil_test.go
View File

@ -33,45 +33,45 @@ func TestResolveTCPAddrs(t *testing.T) {
}{
{
urls: [][]url.URL{
[]url.URL{
url.URL{Scheme: "http", Host: "127.0.0.1:4001"},
url.URL{Scheme: "http", Host: "127.0.0.1:2379"},
{
{Scheme: "http", Host: "127.0.0.1:4001"},
{Scheme: "http", Host: "127.0.0.1:2379"},
},
[]url.URL{
url.URL{Scheme: "http", Host: "127.0.0.1:7001"},
url.URL{Scheme: "http", Host: "127.0.0.1:2380"},
{
{Scheme: "http", Host: "127.0.0.1:7001"},
{Scheme: "http", Host: "127.0.0.1:2380"},
},
},
expected: [][]url.URL{
[]url.URL{
url.URL{Scheme: "http", Host: "127.0.0.1:4001"},
url.URL{Scheme: "http", Host: "127.0.0.1:2379"},
{
{Scheme: "http", Host: "127.0.0.1:4001"},
{Scheme: "http", Host: "127.0.0.1:2379"},
},
[]url.URL{
url.URL{Scheme: "http", Host: "127.0.0.1:7001"},
url.URL{Scheme: "http", Host: "127.0.0.1:2380"},
{
{Scheme: "http", Host: "127.0.0.1:7001"},
{Scheme: "http", Host: "127.0.0.1:2380"},
},
},
},
{
urls: [][]url.URL{
[]url.URL{
url.URL{Scheme: "http", Host: "infra0.example.com:4001"},
url.URL{Scheme: "http", Host: "infra0.example.com:2379"},
{
{Scheme: "http", Host: "infra0.example.com:4001"},
{Scheme: "http", Host: "infra0.example.com:2379"},
},
[]url.URL{
url.URL{Scheme: "http", Host: "infra0.example.com:7001"},
url.URL{Scheme: "http", Host: "infra0.example.com:2380"},
{
{Scheme: "http", Host: "infra0.example.com:7001"},
{Scheme: "http", Host: "infra0.example.com:2380"},
},
},
expected: [][]url.URL{
[]url.URL{
url.URL{Scheme: "http", Host: "10.0.1.10:4001"},
url.URL{Scheme: "http", Host: "10.0.1.10:2379"},
{
{Scheme: "http", Host: "10.0.1.10:4001"},
{Scheme: "http", Host: "10.0.1.10:2379"},
},
[]url.URL{
url.URL{Scheme: "http", Host: "10.0.1.10:7001"},
url.URL{Scheme: "http", Host: "10.0.1.10:2380"},
{
{Scheme: "http", Host: "10.0.1.10:7001"},
{Scheme: "http", Host: "10.0.1.10:2380"},
},
},
hostMap: map[string]string{
@ -81,13 +81,13 @@ func TestResolveTCPAddrs(t *testing.T) {
},
{
urls: [][]url.URL{
[]url.URL{
url.URL{Scheme: "http", Host: "infra0.example.com:4001"},
url.URL{Scheme: "http", Host: "infra0.example.com:2379"},
{
{Scheme: "http", Host: "infra0.example.com:4001"},
{Scheme: "http", Host: "infra0.example.com:2379"},
},
[]url.URL{
url.URL{Scheme: "http", Host: "infra0.example.com:7001"},
url.URL{Scheme: "http", Host: "infra0.example.com:2380"},
{
{Scheme: "http", Host: "infra0.example.com:7001"},
{Scheme: "http", Host: "infra0.example.com:2380"},
},
},
hostMap: map[string]string{
@ -97,13 +97,13 @@ func TestResolveTCPAddrs(t *testing.T) {
},
{
urls: [][]url.URL{
[]url.URL{
url.URL{Scheme: "http", Host: "ssh://infra0.example.com:4001"},
url.URL{Scheme: "http", Host: "ssh://infra0.example.com:2379"},
{
{Scheme: "http", Host: "ssh://infra0.example.com:4001"},
{Scheme: "http", Host: "ssh://infra0.example.com:2379"},
},
[]url.URL{
url.URL{Scheme: "http", Host: "ssh://infra0.example.com:7001"},
url.URL{Scheme: "http", Host: "ssh://infra0.example.com:2380"},
{
{Scheme: "http", Host: "ssh://infra0.example.com:7001"},
{Scheme: "http", Host: "ssh://infra0.example.com:2380"},
},
},
hasError: true,