DRYed test cases in TestDNS

Author: sallyom

test/integration/dns_test.go

@@ -12,22 +12,19 @@ import (
 )
 
 func TestDNS(t *testing.T) {
-	_, err := StartTestAllInOne()
+	masterConfig, _, err := StartTestAllInOne()
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
-	// ugly...
-	server := "127.0.0.1:8053"
-
 	// verify service DNS entry is visible
 	stop := make(chan struct{})
 	util.Until(func() {
 		m1 := &dns.Msg{
 			MsgHdr:   dns.MsgHdr{Id: dns.Id(), RecursionDesired: true},
 			Question: []dns.Question{{"kubernetes.default.local.", dns.TypeA, dns.ClassINET}},
 		}
-		in, err := dns.Exchange(m1, server)
+		in, err := dns.Exchange(m1, masterConfig.DNSConfig.BindAddress)
 		if err != nil {
 			t.Logf("unexpected error: %v", err)
 			return
@@ -47,45 +44,36 @@ func TestDNS(t *testing.T) {
 		close(stop)
 	}, 50*time.Millisecond, stop)
 
-	// verify recursive DNS lookup is visible
-	m1 := &dns.Msg{
-		MsgHdr:   dns.MsgHdr{Id: dns.Id(), RecursionDesired: true},
-		Question: []dns.Question{{"foo.kubernetes.default.local.", dns.TypeA, dns.ClassINET}},
-	}
-	in, err := dns.Exchange(m1, server)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if len(in.Answer) != 1 {
-		t.Fatalf("unexpected response: %#v", in)
+	//verify recursive DNS lookup visible
+	tests := []struct {
+		dnsQuestionName string
+	}{
+		{
+			dnsQuestionName: "foo.kubernetes.default.local.",
+		},
+		{
+			dnsQuestionName: "www.google.com.",
+		},
 	}
-	if a, ok := in.Answer[0].(*dns.A); ok {
-		if a.A == nil {
-			t.Errorf("expected an A record with an IP: %#v", a)
+	for _, tc := range tests {
+		m1 := &dns.Msg{
+			MsgHdr:   dns.MsgHdr{Id: dns.Id(), RecursionDesired: true},
+			Question: []dns.Question{{tc.dnsQuestionName, dns.TypeA, dns.ClassINET}},
 		}
-	} else {
-		t.Errorf("expected an A record: %#v", in)
-	}
-	t.Log(in)
-
-	// verify recursive DNS lookup is visible
-	m1 = &dns.Msg{
-		MsgHdr:   dns.MsgHdr{Id: dns.Id(), RecursionDesired: true},
-		Question: []dns.Question{{"www.google.com.", dns.TypeA, dns.ClassINET}},
-	}
-	in, err = dns.Exchange(m1, server)
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	if len(in.Answer) == 0 {
-		t.Fatalf("unexpected response: %#v", in)
-	}
-	if a, ok := in.Answer[0].(*dns.A); ok {
-		if a.A == nil {
-			t.Errorf("expected an A record with an IP: %#v", a)
+		in, err := dns.Exchange(m1, masterConfig.DNSConfig.BindAddress)
+		if err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if len(in.Answer) < 1 {
+			t.Fatalf("unexpected response: %#v", in)
+		}
+		if a, ok := in.Answer[0].(*dns.A); ok {
+			if a.A == nil {
+				t.Errorf("expected an A record with an IP: %#v", a)
+			}
+		} else {
+			t.Errorf("expected an A record: %#v", in)
 		}
-	} else {
-		t.Errorf("expected an A record: %#v", in)
+		t.Log(in)
 	}
-	t.Log(in)
 }