From 3489112d726c7fd93197db27eb738812cf37c752 Mon Sep 17 00:00:00 2001 From: Alex Sergeyev Date: Sat, 30 Aug 2014 09:45:30 -0400 Subject: [PATCH] Addressed #115 (default mux should be cleaned after tests) --- client_test.go | 6 +++--- server_test.go | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client_test.go b/client_test.go index b6b206c2..88c05507 100644 --- a/client_test.go +++ b/client_test.go @@ -11,7 +11,7 @@ import ( func TestClientSync(t *testing.T) { HandleFunc("miek.nl.", HelloServer) - HandleFunc("example.com.", AnotherHelloServer) + defer HandleRemove("miek.nl.") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { @@ -37,7 +37,7 @@ func TestClientSync(t *testing.T) { func TestClientEDNS0(t *testing.T) { HandleFunc("miek.nl.", HelloServer) - HandleFunc("example.com.", AnotherHelloServer) + defer HandleRemove("miek.nl.") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { @@ -66,7 +66,7 @@ func TestClientEDNS0(t *testing.T) { func TestSingleSingleInflight(t *testing.T) { HandleFunc("miek.nl.", HelloServer) - HandleFunc("example.com.", AnotherHelloServer) + defer HandleRemove("miek.nl.") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { diff --git a/server_test.go b/server_test.go index bf609844..6cf9ffdb 100644 --- a/server_test.go +++ b/server_test.go @@ -59,6 +59,8 @@ func RunLocalTCPServer(laddr string) (*Server, string, error) { func TestServing(t *testing.T) { HandleFunc("miek.nl.", HelloServer) HandleFunc("example.com.", AnotherHelloServer) + defer HandleRemove("miek.nl.") + defer HandleRemove("example.com.") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { @@ -109,6 +111,7 @@ func TestServing(t *testing.T) { func BenchmarkServe(b *testing.B) { b.StopTimer() HandleFunc("miek.nl.", HelloServer) + defer HandleRemove("miek.nl.") a := runtime.GOMAXPROCS(4) s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") @@ -131,6 +134,7 @@ func BenchmarkServe(b *testing.B) { func benchmarkServe6(b *testing.B) { b.StopTimer() HandleFunc("miek.nl.", HelloServer) + defer HandleRemove("miek.nl.") a := runtime.GOMAXPROCS(4) s, addrstr, err := RunLocalUDPServer("[::1]:0") if err != nil { @@ -161,6 +165,7 @@ func HelloServerCompress(w ResponseWriter, req *Msg) { func BenchmarkServeCompress(b *testing.B) { b.StopTimer() HandleFunc("miek.nl.", HelloServerCompress) + defer HandleRemove("miek.nl.") a := runtime.GOMAXPROCS(4) s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil { @@ -261,6 +266,7 @@ func HelloServerLargeResponse(resp ResponseWriter, req *Msg) { func TestServingLargeResponses(t *testing.T) { HandleFunc("example.", HelloServerLargeResponse) + defer HandleRemove("example.") s, addrstr, err := RunLocalUDPServer("127.0.0.1:0") if err != nil {