remove upstream option, re-enable upstream test

Signed-off-by: zounengren <[email protected]>
coredns · Apr 9, 2020 · d5e3a35 · d5e3a35
1 parent ce07f5e
commit d5e3a35
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 16 deletions.
diff --git a/test/kubernetes/address_test.go b/test/kubernetes/address_test.go
@@ -57,7 +57,7 @@ var dnsTestCasesA = []test.Case{
 			test.A("*.test-1.svc.cluster.local.      303    IN      A       172.17.0.254"),
 			test.A("*.test-1.svc.cluster.local.      303    IN      A       172.17.0.255"),
 			test.CNAME("*.test-1.svc.cluster.local.  303    IN      CNAME   example.net."),
-			// test.A("example.net.                     303    IN      A       13.14.15.16"), // Not resolved because no proxy is defined.
+			test.A("example.net.                     303    IN      A       13.14.15.16"),
 		},
 	},
 	{ // A wild card service name in an un-exposed namespace result in nxdomain
@@ -146,9 +146,9 @@ func TestKubernetesA(t *testing.T) {
         errors
         log
         kubernetes cluster.local 10.in-addr.arpa {
-            namespaces test-1
-            upstream ` + udp + `
-        }
+			namespaces test-1
+		}
+		forward . ` + udp + `
     }
 `
 

diff --git a/test/kubernetes/fallthrough_test.go b/test/kubernetes/fallthrough_test.go
@@ -56,7 +56,6 @@ func TestKubernetesFallthrough(t *testing.T) {
 	defer rmFunc()
 
 	time.Sleep(1 * time.Second)
-
 	corefile := `    .:53 {
       health
       ready
@@ -65,7 +64,6 @@ func TestKubernetesFallthrough(t *testing.T) {
       file /etc/coredns/Zonefile cluster.local
       kubernetes cluster.local {
           namespaces test-1
-          upstream ` + udp + `
           fallthrough
       }
       forward . ` + udp + `
@@ -120,13 +118,6 @@ var dnsTestCasesFallthroughFiltered = []test.Case{
 }
 
 func TestKubernetesFallthroughFiltered(t *testing.T) {
-
-	rmFunc, upstream, udp := UpstreamServer(t, "example.net", ExampleNet)
-	defer upstream.Stop()
-	defer rmFunc()
-
-	time.Sleep(1 * time.Second)
-
 	corefile := `    .:53 {
       health
       ready
@@ -135,7 +126,6 @@ func TestKubernetesFallthroughFiltered(t *testing.T) {
       file /etc/coredns/Zonefile cluster.local
       kubernetes cluster.local {
           namespaces test-1
-          upstream ` + udp + `
           fallthrough svc.cluster.local
       }
     }

diff --git a/test/kubernetes/srv_test.go b/test/kubernetes/srv_test.go
@@ -171,8 +171,8 @@ func TestKubernetesSRV(t *testing.T) {
 	    log
         kubernetes cluster.local {
             namespaces test-1
-            upstream ` + udp + `
-        }
+		}
+		forward . ` + udp + `
     }
 `