github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding a test for runtime-config to federation-apiserver

Browse Source
This commit is contained in:
nikhiljindal
2017-02-27 21:55:47 -08:00
parent e8fb6d1c47
commit c778f07e85
2 changed files with 64 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/integration/federation/framework/api.go
View File

@@ -33,7 +33,8 @@ import (
const apiNoun = "federation apiserver"
func getRunOptions() *options.ServerRunOptions {
// GetRunOptions returns the default run options that can be used to run a test federation apiserver.
func GetRunOptions() *options.ServerRunOptions {
r := options.NewServerRunOptions()
r.Etcd.StorageConfig.ServerList = []string{framework.GetEtcdURLFromEnv()}
// Use a unique prefix to ensure isolation from other tests using the same etcd instance
@@ -49,7 +50,14 @@ type FederationAPIFixture struct {
stopChan chan struct{}
}
// SetUp runs federation apiserver with default run options.
func (f *FederationAPIFixture) SetUp(t *testing.T) {
f.SetUpWithRunOptions(t, GetRunOptions())
}
// SetUpWithRunOptions runs federation apiserver with the given run options.
// Uses default run options if runOptions is nil.
func (f *FederationAPIFixture) SetUpWithRunOptions(t *testing.T, runOptions *options.ServerRunOptions) {
if f.stopChan != nil {
t.Fatal("SetUp() already called")
}
@@ -57,8 +65,6 @@ func (f *FederationAPIFixture) SetUp(t *testing.T) {
f.stopChan = make(chan struct{})
runOptions := getRunOptions()
err := startServer(t, runOptions, f.stopChan)
if err != nil {
t.Fatal(err)