Only skip petset test if resource is missing

This commit is contained in:
Jeff Lowdermilk 2016-09-13 18:50:36 -07:00
parent 115855bbd2
commit 915e735d21

View File

@ -59,7 +59,10 @@ const (
// GCE Quota requirements: 3 pds, one per pet manifest declared above.
// GCE Api requirements: nodes and master need storage r/w permissions.
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 c *client.Client
@ -67,7 +70,7 @@ var _ = framework.KubeDescribe("PetSet [Slow] [Feature:PetSet]", func() {
// PetSet is in alpha, so it's disabled on all platforms except GCE.
// In theory, tests that restart pets should pass on any platform with a
// dynamic volume provisioner.
framework.SkipUnlessProviderIs("gce")
framework.SkipIfMissingResource(f.ClientPool, unversioned.GroupVersionResource{Group: apps.GroupName, Version: "v1alpha1", Resource: "petsets"}, f.Namespace.Name)
c = f.Client
ns = f.Namespace.Name
@ -166,10 +169,6 @@ var _ = framework.KubeDescribe("PetSet [Slow] [Feature:PetSet]", func() {
})
framework.KubeDescribe("Deploy clustered applications [Slow] [Feature:PetSet]", func() {
BeforeEach(func() {
framework.SkipUnlessProviderIs("gce")
})
AfterEach(func() {
if CurrentGinkgoTestDescription().Failed {
dumpDebugInfo(c, ns)