github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-10 05:30:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3656 from jbeda/vagrant-e2e

Browse Source 
Fix up a bunch of vagrant stuff to enable e2e
This commit is contained in:
Brian Grant
2015-01-21 07:26:13 -08:00
parent 20019ead4c a76b6dddad
commit 91533095e5
6 changed files with 88 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/e2e/cluster_dns.go
View File

@@ -37,6 +37,11 @@ func TestClusterDNS(c *client.Client) bool {
return true
}
if testContext.provider == "vagrant" {
glog.Infof("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
return true
}
podClient := c.Pods(api.NamespaceDefault)
//TODO: Wait for skyDNS

5
test/e2e/network.go
View File

@@ -25,6 +25,11 @@ import (
)
func TestNetwork(c *client.Client) bool {
if testContext.provider == "vagrant" {
glog.Infof("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
return true
}
ns := api.NamespaceDefault
svc, err := c.Services(ns).Create(loadObjectOrDie(assetPath(
"contrib", "for-tests", "network-tester", "service.json",