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

Merge pull request #10197 from mesosphere/ginkgo-skip

Browse Source 
Use ginkgo's new Skip()
This commit is contained in:
Robert Bailey
2015-06-26 10:44:34 -07:00
parent 0048eae8eb 32a09cfcee
commit 198b334227
41 changed files with 494 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/dns.go
View File

@@ -185,10 +185,8 @@ var _ = Describe("DNS", func() {
f := NewFramework("dns")
It("should provide DNS for the cluster", func() {
if providerIs("vagrant") {
By("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
return
}
// TODO: support DNS on vagrant #3580
SkipIfProviderIs("vagrant")
podClient := f.Client.Pods(api.NamespaceDefault)
@@ -224,11 +222,10 @@ var _ = Describe("DNS", func() {
pod := createDNSPod(f.Namespace.Name, wheezyProbeCmd, jessieProbeCmd)
validateDNSResults(f, pod, append(wheezyFileNames, jessieFileNames...))
})
It("should provide DNS for services", func() {
if providerIs("vagrant") {
By("Skipping test which is broken for vagrant (See https://github.com/GoogleCloudPlatform/kubernetes/issues/3580)")
return
}
// TODO: support DNS on vagrant #3580
SkipIfProviderIs("vagrant")
podClient := f.Client.Pods(api.NamespaceDefault)