Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-11-03 19:17:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor test cleanup

Browse Source
This commit is contained in:
Matthew Holt 2017-01-23 22:06:55 -07:00
parent 82929b122a
commit 59e6ceb518
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
caddy_test.go
View File

@ -67,7 +67,6 @@ func TestListenerAddrEqual(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
defer ln1.Close() defer ln1.Close()
ln1port := strconv.Itoa(ln1.Addr().(*net.TCPAddr).Port) ln1port := strconv.Itoa(ln1.Addr().(*net.TCPAddr).Port)
ln2, err := net.Listen("tcp", "127.0.0.1:0") ln2, err := net.Listen("tcp", "127.0.0.1:0")
@ -75,7 +74,6 @@ func TestListenerAddrEqual(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
defer ln2.Close() defer ln2.Close()
ln2port := strconv.Itoa(ln2.Addr().(*net.TCPAddr).Port) ln2port := strconv.Itoa(ln2.Addr().(*net.TCPAddr).Port)
for i, test := range []struct { for i, test := range []struct {
@ -86,12 +84,12 @@ func TestListenerAddrEqual(t *testing.T) {
{ln1, ":1234", false}, {ln1, ":1234", false},
{ln1, "0.0.0.0:1234", false}, {ln1, "0.0.0.0:1234", false},
{ln1, "0.0.0.0", false}, {ln1, "0.0.0.0", false},
{ln1, ":" + ln1port + "", true}, {ln1, ":" + ln1port, true},
{ln1, "0.0.0.0:" + ln1port + "", true}, {ln1, "0.0.0.0:" + ln1port, true},
{ln2, ":" + ln2port + "", false}, {ln2, ":" + ln2port, false},
{ln2, "127.0.0.1:1234", false}, {ln2, "127.0.0.1:1234", false},
{ln2, "127.0.0.1", false}, {ln2, "127.0.0.1", false},
{ln2, "127.0.0.1:" + ln2port + "", true}, {ln2, "127.0.0.1:" + ln2port, true},
} { } {
if got, want := listenerAddrEqual(test.ln, test.addr), test.expect; got != want { if got, want := listenerAddrEqual(test.ln, test.addr), test.expect; got != want {
t.Errorf("Test %d (%s == %s): expected %v but was %v", i, test.addr, test.ln.Addr().String(), want, got) t.Errorf("Test %d (%s == %s): expected %v but was %v", i, test.addr, test.ln.Addr().String(), want, got)