github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32632 from jlowdermilk/petset-e2e

Browse Source 
Automatic merge from submit-queue

Only skip petset test if resource is missing

**What this PR does / why we need it**:
Unblock testing petset on other providers.

cc @pwittrock. Would like to cherrypick onto 1.4 but this is test code only, so it can wait til after release cut.
This commit is contained in:
Kubernetes Submit Queue 2016-09-13 22:09:40 -07:00 committed by GitHub
commit 61ba82c637
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/petset.go
View File

@ -59,15 +59,21 @@ const (
// GCE Quota requirements: 3 pds, one per pet manifest declared above. // GCE Quota requirements: 3 pds, one per pet manifest declared above.
// GCE Api requirements: nodes and master need storage r/w permissions. // GCE Api requirements: nodes and master need storage r/w permissions.
var _ = framework.KubeDescribe("PetSet [Slow] [Feature:PetSet]", func() { var _ = framework.KubeDescribe("PetSet [Slow] [Feature:PetSet]", func() {
f := framework.NewDefaultFramework("petset") options := framework.FrameworkOptions{
GroupVersion: &unversioned.GroupVersion{Group: apps.GroupName, Version: "v1alpha1"},
}
f := framework.NewFramework("petset", options, nil)
var ns string var ns string
var c *client.Client var c *client.Client
BeforeEach(func() { BeforeEach(func() {
// PetSet is in alpha, so it's disabled on all platforms except GCE. // PetSet is in alpha, so it's disabled on some platforms. We skip this
// test if a resource get fails on non-GCE platforms.
// In theory, tests that restart pets should pass on any platform with a // In theory, tests that restart pets should pass on any platform with a
// dynamic volume provisioner. // dynamic volume provisioner.
framework.SkipUnlessProviderIs("gce") if !framework.ProviderIs("gce") {
framework.SkipIfMissingResource(f.ClientPool, unversioned.GroupVersionResource{Group: apps.GroupName, Version: "v1alpha1", Resource: "petsets"}, f.Namespace.Name)
}
c = f.Client c = f.Client
ns = f.Namespace.Name ns = f.Namespace.Name
@ -166,10 +172,6 @@ var _ = framework.KubeDescribe("PetSet [Slow] [Feature:PetSet]", func() {
}) })
framework.KubeDescribe("Deploy clustered applications [Slow] [Feature:PetSet]", func() { framework.KubeDescribe("Deploy clustered applications [Slow] [Feature:PetSet]", func() {
BeforeEach(func() {
framework.SkipUnlessProviderIs("gce")
})
AfterEach(func() { AfterEach(func() {
if CurrentGinkgoTestDescription().Failed { if CurrentGinkgoTestDescription().Failed {
dumpDebugInfo(c, ns) dumpDebugInfo(c, ns)