From d6606a6aa941008a4dab84ec2438dbe5ab59ea65 Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair@redhat.com>
Date: Mon, 15 Aug 2016 11:25:02 -0500
Subject: [PATCH] etcd3 validation showed that several unit tests that depend
 on apiserver being fully stood up should be integration tests, not unit
 tests.

---
 hack/.linted_packages                                        | 3 +++
 .../discoverysummarizer/discoverysummarizer_test.go          | 5 +++--
 .../integration/examples}/apiserver_test.go                  | 5 +++--
 .../app => test/integration/federation}/server_test.go       | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)
 rename {cmd/kubernetes-discovery => test/integration}/discoverysummarizer/discoverysummarizer_test.go (94%)
 rename {examples/apiserver => test/integration/examples}/apiserver_test.go (95%)
 rename {federation/cmd/federation-apiserver/app => test/integration/federation}/server_test.go (99%)

diff --git a/hack/.linted_packages b/hack/.linted_packages
index c8d44cd07d0..f0f6d0554c1 100644
--- a/hack/.linted_packages
+++ b/hack/.linted_packages
@@ -200,3 +200,6 @@ test/soak/serve_hostnames
 third_party/forked/golang/expansion
 pkg/util/maps
 pkg/volume/quobyte
+test/integration/discoverysummarizer
+test/integration/examples
+test/integration/federation
diff --git a/cmd/kubernetes-discovery/discoverysummarizer/discoverysummarizer_test.go b/test/integration/discoverysummarizer/discoverysummarizer_test.go
similarity index 94%
rename from cmd/kubernetes-discovery/discoverysummarizer/discoverysummarizer_test.go
rename to test/integration/discoverysummarizer/discoverysummarizer_test.go
index 19c7a9560dc..2ee06618218 100644
--- a/cmd/kubernetes-discovery/discoverysummarizer/discoverysummarizer_test.go
+++ b/test/integration/discoverysummarizer/discoverysummarizer_test.go
@@ -22,6 +22,7 @@ import (
 	"testing"
 	"time"
 
+	"k8s.io/kubernetes/cmd/kubernetes-discovery/discoverysummarizer"
 	"k8s.io/kubernetes/examples/apiserver"
 )
 
@@ -46,10 +47,10 @@ func testResponse(t *testing.T, serverURL, path string, expectedStatusCode int)
 }
 
 func runDiscoverySummarizer(t *testing.T) string {
-	configFilePath := "../config.json"
+	configFilePath := "../../../cmd/kubernetes-discovery/config.json"
 	port := "9090"
 	serverURL := "http://localhost:" + port
-	s, err := NewDiscoverySummarizer(configFilePath)
+	s, err := discoverysummarizer.NewDiscoverySummarizer(configFilePath)
 	if err != nil {
 		t.Errorf("unexpected error: %v\n", err)
 	}
diff --git a/examples/apiserver/apiserver_test.go b/test/integration/examples/apiserver_test.go
similarity index 95%
rename from examples/apiserver/apiserver_test.go
rename to test/integration/examples/apiserver_test.go
index c9627ceaeef..60a63defd38 100644
--- a/examples/apiserver/apiserver_test.go
+++ b/test/integration/examples/apiserver_test.go
@@ -27,10 +27,11 @@ import (
 	"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1"
 
 	"github.com/stretchr/testify/assert"
+	"k8s.io/kubernetes/examples/apiserver"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 )
 
-var serverIP = fmt.Sprintf("http://localhost:%d", InsecurePort)
+var serverIP = fmt.Sprintf("http://localhost:%d", apiserver.InsecurePort)
 
 var groupVersion = v1.SchemeGroupVersion
 
@@ -41,7 +42,7 @@ var groupVersionForDiscovery = unversioned.GroupVersionForDiscovery{
 
 func TestRun(t *testing.T) {
 	go func() {
-		if err := Run(NewServerRunOptions()); err != nil {
+		if err := apiserver.Run(apiserver.NewServerRunOptions()); err != nil {
 			t.Fatalf("Error in bringing up the server: %v", err)
 		}
 	}()
diff --git a/federation/cmd/federation-apiserver/app/server_test.go b/test/integration/federation/server_test.go
similarity index 99%
rename from federation/cmd/federation-apiserver/app/server_test.go
rename to test/integration/federation/server_test.go
index a77b05ffd58..e934d27c61f 100644
--- a/federation/cmd/federation-apiserver/app/server_test.go
+++ b/test/integration/federation/server_test.go
@@ -29,6 +29,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	fed_v1b1 "k8s.io/kubernetes/federation/apis/federation/v1beta1"
+	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app"
 	"k8s.io/kubernetes/federation/cmd/federation-apiserver/app/options"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
@@ -90,7 +91,7 @@ func TestRun(t *testing.T) {
 	s.ServiceClusterIPRange = *ipNet
 	s.StorageConfig.ServerList = []string{"http://localhost:2379"}
 	go func() {
-		if err := Run(s); err != nil {
+		if err := app.Run(s); err != nil {
 			t.Fatalf("Error in bringing up the server: %v", err)
 		}
 	}()