scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30634 from timothysc/etcd3_shouldbe_intergration_tests

Browse Source 
Automatic merge from submit-queue

Move UTs that block on apiserver to integration tests. 

In validating etcd.v3client we had uncovered that a change in the behavior of the client https://github.com/coreos/etcd/issues/6162 , caused a number of unit tests to fail.  These test failures were due to the fact that the unit tests were trying to standup a apiserver even though there was no etcd backend stood up.  

This PR simply shuffles those tests to integration tests, which is where they should be. 

/cc @kubernetes/sig-scalability @wojtek-t @hongchaodeng @xiang90
This commit is contained in:
Kubernetes Submit Queue
2016-08-18 18:39:13 -07:00
committed by GitHub
parent 57ad590d8d d6606a6aa9
commit c5e3b79f32
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
hack/.linted_packages
View File

@@ -200,3 +200,6 @@ test/soak/serve_hostnames
third_party/forked/golang/expansion third_party/forked/golang/expansion
pkg/util/maps pkg/util/maps
pkg/volume/quobyte pkg/volume/quobyte
test/integration/discoverysummarizer
test/integration/examples
test/integration/federation

5
cmd/kubernetes-discovery/discoverysummarizer/discoverysummarizer_test.go → test/integration/discoverysummarizer/discoverysummarizer_test.go
View File

@@ -22,6 +22,7 @@ import (
"testing" "testing"
"time" "time"
"k8s.io/kubernetes/cmd/kubernetes-discovery/discoverysummarizer"
"k8s.io/kubernetes/examples/apiserver" "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 { func runDiscoverySummarizer(t *testing.T) string {
configFilePath := "../config.json" configFilePath := "../../../cmd/kubernetes-discovery/config.json"
port := "9090" port := "9090"
serverURL := "http://localhost:" + port serverURL := "http://localhost:" + port
s, err := NewDiscoverySummarizer(configFilePath) s, err := discoverysummarizer.NewDiscoverySummarizer(configFilePath)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v\n", err) t.Errorf("unexpected error: %v\n", err)
} }

5
examples/apiserver/apiserver_test.go → test/integration/examples/apiserver_test.go
View File

@@ -27,10 +27,11 @@ import (
"k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1" "k8s.io/kubernetes/cmd/libs/go2idl/client-gen/test_apis/testgroup.k8s.io/v1"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/kubernetes/examples/apiserver"
"k8s.io/kubernetes/pkg/api/unversioned" "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 var groupVersion = v1.SchemeGroupVersion
@@ -41,7 +42,7 @@ var groupVersionForDiscovery = unversioned.GroupVersionForDiscovery{
func TestRun(t *testing.T) { func TestRun(t *testing.T) {
go func() { 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) t.Fatalf("Error in bringing up the server: %v", err)
} }
}() }()

3
federation/cmd/federation-apiserver/app/server_test.go → test/integration/federation/server_test.go
View File

@@ -29,6 +29,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
fed_v1b1 "k8s.io/kubernetes/federation/apis/federation/v1beta1" 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/federation/cmd/federation-apiserver/app/options"
"k8s.io/kubernetes/pkg/api/unversioned" "k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
@@ -90,7 +91,7 @@ func TestRun(t *testing.T) {
s.ServiceClusterIPRange = *ipNet s.ServiceClusterIPRange = *ipNet
s.StorageConfig.ServerList = []string{"http://localhost:2379"} s.StorageConfig.ServerList = []string{"http://localhost:2379"}
go func() { 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) t.Fatalf("Error in bringing up the server: %v", err)
} }
}() }()