github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Skip StatefulSet e2e tests if this resource is not found"

Browse Source
This commit is contained in:
Dawn Chen 2016-11-23 11:50:02 -08:00 committed by Anirudh
parent 28e8b5ab2b
commit 388fb2028c
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/network_partition.go
View File

@ -368,7 +368,6 @@ 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

@ -66,10 +66,6 @@ const (
readTimeout = 60 * time.Second readTimeout = 60 * time.Second
) )
var (
StatefulSetGroupVersionResource = schema.GroupVersionResource{Group: apps.GroupName, Version: "v1beta1", Resource: "statefulsets"}
)
// 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("StatefulSet", func() { var _ = framework.KubeDescribe("StatefulSet", func() {
@ -80,7 +76,6 @@ var _ = framework.KubeDescribe("StatefulSet", 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() {
@ -408,7 +403,7 @@ var _ = framework.KubeDescribe("Stateful Set recreate", func() {
petPodName := "web-0" petPodName := "web-0"
BeforeEach(func() { BeforeEach(func() {
framework.SkipIfMissingResource(f.ClientPool, StatefulSetGroupVersionResource, f.Namespace.Name) framework.SkipUnlessProviderIs("gce", "vagrant")
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)