github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3203 from thockin/integ

Browse Source 
Integration test scaffolding fixes
This commit is contained in:
Eric Tune 2015-01-05 09:21:57 -08:00
commit 4432ba06bd
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/integration/integration.go
View File

@ -19,6 +19,7 @@ limitations under the License.
package main package main
import ( import (
"flag"
"io/ioutil" "io/ioutil"
"net" "net"
"net/http" "net/http"
@ -172,7 +173,7 @@ func startComponents(manifestURL string) (apiServerURL string) {
schedulerConfigFactory := factory.NewConfigFactory(cl) schedulerConfigFactory := factory.NewConfigFactory(cl)
schedulerConfig, err := schedulerConfigFactory.Create() schedulerConfig, err := schedulerConfigFactory.Create()
if err != nil { if err != nil {
glog.Fatal("Couldn't create scheduler config: %v", err) glog.Fatalf("Couldn't create scheduler config: %v", err)
} }
scheduler.New(schedulerConfig).Run() scheduler.New(schedulerConfig).Run()
@ -548,6 +549,7 @@ func runServiceTest(client *client.Client) {
type testFunc func(*client.Client) type testFunc func(*client.Client)
func main() { func main() {
flag.Parse()
runtime.GOMAXPROCS(runtime.NumCPU()) runtime.GOMAXPROCS(runtime.NumCPU())
util.ReallyCrash = true util.ReallyCrash = true
util.InitLogs() util.InitLogs()

1
pkg/standalone/standalone.go
View File

@ -157,6 +157,7 @@ func SimpleRunKubelet(etcdClient tools.EtcdClient, dockerClient dockertools.Dock
Address: util.IP(net.ParseIP(address)), Address: util.IP(net.ParseIP(address)),
EnableServer: true, EnableServer: true,
EnableDebuggingHandlers: true, EnableDebuggingHandlers: true,
SyncFrequency: 3 * time.Second,
} }
RunKubelet(&kcfg) RunKubelet(&kcfg)
} }