scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Skip StatefulSet e2e tests if this resource is not found

Browse Source
This commit is contained in:
Janet Kuo
2016-11-23 10:00:37 -08:00
parent 8c212e7fb8
commit 060ff8ebe8
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/network_partition.go
View File

@@ -367,6 +367,7 @@ var _ = framework.KubeDescribe("Network Partition [Disruptive] [Slow]", func() {
BeforeEach(func() { BeforeEach(func() {
framework.SkipUnlessProviderIs("gce", "gke") framework.SkipUnlessProviderIs("gce", "gke")
framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name)
By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name) By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name)
headlessService := createServiceSpec(headlessSvcName, "", true, labels) headlessService := createServiceSpec(headlessSvcName, "", true, labels)
_, err := f.ClientSet.Core().Services(f.Namespace.Name).Create(headlessService) _, err := f.ClientSet.Core().Services(f.Namespace.Name).Create(headlessService)

7
test/e2e/petset.go
View File

@@ -64,6 +64,10 @@ const (
readTimeout = 60 * time.Second readTimeout = 60 * time.Second
) )
var (
StatefulSetGroupVersionResource = unversioned.GroupVersionResource{Group: apps.GroupName, Version: "v1beta1", Resource: "statefulsets"}
)
// Time: 25m, slow by design. // Time: 25m, slow by design.
// 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.
@@ -75,6 +79,7 @@ var _ = framework.KubeDescribe("StatefulSet [Slow]", func() {
BeforeEach(func() { BeforeEach(func() {
c = f.ClientSet c = f.ClientSet
ns = f.Namespace.Name ns = f.Namespace.Name
framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name)
}) })
framework.KubeDescribe("Basic StatefulSet functionality", func() { framework.KubeDescribe("Basic StatefulSet functionality", func() {
@@ -402,7 +407,7 @@ var _ = framework.KubeDescribe("Stateful Set recreate [Slow]", func() {
petPodName := "web-0" petPodName := "web-0"
BeforeEach(func() { BeforeEach(func() {
framework.SkipUnlessProviderIs("gce", "vagrant") framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name)
By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name) By("creating service " + headlessSvcName + " in namespace " + f.Namespace.Name)
headlessService := createServiceSpec(headlessSvcName, "", true, labels) headlessService := createServiceSpec(headlessSvcName, "", true, labels)
_, err := f.ClientSet.Core().Services(f.Namespace.Name).Create(headlessService) _, err := f.ClientSet.Core().Services(f.Namespace.Name).Create(headlessService)