From d41284f66df349e395b12a63f1a1dd9f7286ea7c Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Thu, 9 Oct 2014 13:08:58 +0100 Subject: [PATCH] Refactor test setup --- server/mdns_client_test.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/mdns_client_test.go b/server/mdns_client_test.go index 485f895a..fb613e7a 100644 --- a/server/mdns_client_test.go +++ b/server/mdns_client_test.go @@ -63,8 +63,7 @@ func RunLocalMulticastServer() (*dns.Server, error) { return server, nil } -func TestSimpleQuery(t *testing.T) { - log.Println("TestSimpleQuery starting") +func setup(t *testing.T) (*MDNSClient, *dns.Server, error) { mdnsClient, err := NewMDNSClient() if err != nil { t.Fatal(err) @@ -73,12 +72,18 @@ func TestSimpleQuery(t *testing.T) { if err != nil { t.Fatal(err) } - defer mdnsClient.Shutdown() server, err := RunLocalMulticastServer() if err != nil { t.Fatalf("Unable to run test server: %s", err) } + return mdnsClient, server, err +} + +func TestSimpleQuery(t *testing.T) { + log.Println("TestSimpleQuery starting") + mdnsClient, server, _ := setup(t) + defer mdnsClient.Shutdown() defer server.Shutdown() var received_addr net.IP