More Middleware -> Plugin conversions (#1088)

Forgot about these.

plugin/etcd/cname_test.go

@@ -16,7 +16,7 @@ import (
 
 // Check the ordering of returned cname.
 func TestCnameLookup(t *testing.T) {
-	etc := newEtcdMiddleware()
+	etc := newEtcdPlugin()
 
 	for _, serv := range servicesCname {
 		set(t, etc, serv.Key, 0, serv)

plugin/etcd/group_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestGroupLookup(t *testing.T) {
-	etc := newEtcdMiddleware()
+	etc := newEtcdPlugin()
 
 	for _, serv := range servicesGroup {
 		set(t, etc, serv.Key, 0, serv)

plugin/etcd/lookup_test.go

@@ -221,7 +221,7 @@ var dnsTestCases = []test.Case{
 	},
 }
 
-func newEtcdMiddleware() *Etcd {
+func newEtcdPlugin() *Etcd {
 	ctxt = context.TODO()
 
 	endpoints := []string{"http://localhost:2379"}
@@ -253,7 +253,7 @@ func delete(t *testing.T, e *Etcd, k string) {
 }
 
 func TestLookup(t *testing.T) {
-	etc := newEtcdMiddleware()
+	etc := newEtcdPlugin()
 	for _, serv := range services {
 		set(t, etc, serv.Key, 0, serv)
 		defer delete(t, etc, serv.Key)

plugin/etcd/multi_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestMultiLookup(t *testing.T) {
-	etc := newEtcdMiddleware()
+	etc := newEtcdPlugin()
 	etc.Zones = []string{"skydns.test.", "miek.nl."}
 	etc.Fallthrough = true
 	etc.Next = test.ErrorHandler()

plugin/etcd/other_test.go

@@ -17,7 +17,7 @@ import (
 )
 
 func TestOtherLookup(t *testing.T) {
-	etc := newEtcdMiddleware()
+	etc := newEtcdPlugin()
 
 	for _, serv := range servicesOther {
 		set(t, etc, serv.Key, 0, serv)

plugin/etcd/stub_test.go

@@ -39,7 +39,7 @@ func TestStubLookup(t *testing.T) {
 	exampleNetStub := &msg.Service{Host: host, Port: port, Key: "a.example.net.stub.dns.skydns.test."}
 	servicesStub = append(servicesStub, exampleNetStub)
 
-	etc := newEtcdMiddleware()
+	etc := newEtcdPlugin()
 
 	for _, serv := range servicesStub {
 		set(t, etc, serv.Key, 0, serv)