From a559d8d9b23b62c673ff97adf519084c8d7edc8f Mon Sep 17 00:00:00 2001
From: Tim Hockin <thockin@google.com>
Date: Sat, 20 Sep 2014 11:38:05 -0700
Subject: [PATCH] Move some test-only code into the test

---
 pkg/proxy/proxier.go      |  9 ---------
 pkg/proxy/proxier_test.go | 13 +++++++++++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkg/proxy/proxier.go b/pkg/proxy/proxier.go
index f34ca3eb572..981710ecfba 100644
--- a/pkg/proxy/proxier.go
+++ b/pkg/proxy/proxier.go
@@ -317,15 +317,6 @@ func NewProxier(loadBalancer LoadBalancer, address string) *Proxier {
 	}
 }
 
-// StopProxy stops the proxy for the named service.
-func (proxier *Proxier) StopProxy(service string) error {
-	info, found := proxier.getServiceInfo(service)
-	if !found {
-		return fmt.Errorf("unknown service: %s", service)
-	}
-	return proxier.stopProxy(service, info)
-}
-
 // This assumes proxier.mu is not locked.
 func (proxier *Proxier) stopProxy(service string, info *serviceInfo) error {
 	proxier.mu.Lock()
diff --git a/pkg/proxy/proxier_test.go b/pkg/proxy/proxier_test.go
index f62ca8c6f33..70184b36ad1 100644
--- a/pkg/proxy/proxier_test.go
+++ b/pkg/proxy/proxier_test.go
@@ -171,6 +171,15 @@ func TestUDPProxy(t *testing.T) {
 	testEchoUDP(t, "127.0.0.1", proxyPort)
 }
 
+// Helper: Stops the proxy for the named service.
+func stopProxyByName(proxier *Proxier, service string) error {
+	info, found := proxier.getServiceInfo(service)
+	if !found {
+		return fmt.Errorf("unknown service: %s", service)
+	}
+	return proxier.stopProxy(service, info)
+}
+
 func TestTCPProxyStop(t *testing.T) {
 	lb := NewLoadBalancerRR()
 	lb.OnUpdate([]api.Endpoints{
@@ -192,7 +201,7 @@ func TestTCPProxyStop(t *testing.T) {
 	}
 	conn.Close()
 
-	p.StopProxy("echo")
+	stopProxyByName(p, "echo")
 	// Wait for the port to really close.
 	if err := waitForClosedPortTCP(p, proxyPort); err != nil {
 		t.Fatalf(err.Error())
@@ -220,7 +229,7 @@ func TestUDPProxyStop(t *testing.T) {
 	}
 	conn.Close()
 
-	p.StopProxy("echo")
+	stopProxyByName(p, "echo")
 	// Wait for the port to really close.
 	if err := waitForClosedPortUDP(p, proxyPort); err != nil {
 		t.Fatalf(err.Error())