Skip to content

Commit 16174e7

Browse files
committed
update e2e test
1 parent f121cb0 commit 16174e7

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

test/e2e/rediscluster/redis_cluster_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
var (
2424
defaultTimeout = 10 * time.Minute
25-
wailTime = 35 * time.Second
25+
wailTime = 70 * time.Second
2626
)
2727

2828
const (
@@ -198,7 +198,7 @@ var _ = ginkgo.Describe("RedisCluster", func() {
198198
})
199199
})
200200

201-
ginkgo.Describe("[RedisCluster] create a basic redis cluster, then delete pod,statefuleset,depolyment", func() {
201+
ginkgo.Describe("[RedisCluster] create a basic redis cluster, then delete pod,statefulSet", func() {
202202
name := e2e.RandString(8)
203203
rc := &redisv1beta1.RedisCluster{}
204204
auth := &util.AuthConfig{}
@@ -225,9 +225,9 @@ var _ = ginkgo.Describe("RedisCluster", func() {
225225
})
226226
})
227227

228-
ginkgo.Context("when delete statefulset of the redis cluster", func() {
228+
ginkgo.Context("when delete statefulSet of the redis cluster", func() {
229229
ginkgo.BeforeEach(func() {
230-
f.Logf("delete statefulset %s %s", rc.Namespace, util.GetRedisName(rc))
230+
f.Logf("delete statefulSet %s %s", rc.Namespace, util.GetRedisName(rc))
231231
err := f.K8sService.DeleteStatefulSet(rc.Namespace, util.GetRedisName(rc))
232232
gomega.Expect(err).NotTo(gomega.HaveOccurred())
233233
f.WaitRedisclusterHealthy(rc.Name, wailTime, defaultTimeout)
@@ -247,9 +247,9 @@ var _ = ginkgo.Describe("RedisCluster", func() {
247247
})
248248
})
249249

250-
ginkgo.Context("when delete sentinel deployment of the redis cluster", func() {
250+
ginkgo.Context("when delete sentinel statefulSet of the redis cluster", func() {
251251
ginkgo.BeforeEach(func() {
252-
err := f.K8sService.DeleteDeployment(rc.Namespace, util.GetSentinelName(rc))
252+
err := f.K8sService.DeleteStatefulSet(rc.Namespace, util.GetSentinelName(rc))
253253
gomega.Expect(err).NotTo(gomega.HaveOccurred())
254254
f.WaitRedisclusterHealthy(rc.Name, wailTime, defaultTimeout)
255255
})
@@ -262,7 +262,7 @@ var _ = ginkgo.Describe("RedisCluster", func() {
262262
})
263263
})
264264

265-
ginkgo.Describe("[RedisCluster] create a redis cluster with pvc, then delete pod,statefuleset,depolyment", func() {
265+
ginkgo.Describe("[RedisCluster] create a redis cluster with pvc, then delete pod,statefulSet", func() {
266266
name := e2e.RandString(8)
267267
rc := &redisv1beta1.RedisCluster{}
268268
auth := &util.AuthConfig{}
@@ -289,9 +289,9 @@ var _ = ginkgo.Describe("RedisCluster", func() {
289289
})
290290
})
291291

292-
ginkgo.Context("when delete statefulset of the redis cluster", func() {
292+
ginkgo.Context("when delete statefulSet of the redis cluster", func() {
293293
ginkgo.BeforeEach(func() {
294-
f.Logf("delete statefulset %s %s", rc.Namespace, util.GetRedisName(rc))
294+
f.Logf("delete statefulSet %s %s", rc.Namespace, util.GetRedisName(rc))
295295
err := f.K8sService.DeleteStatefulSet(rc.Namespace, util.GetRedisName(rc))
296296
gomega.Expect(err).NotTo(gomega.HaveOccurred())
297297
f.WaitRedisclusterHealthy(rc.Name, wailTime, defaultTimeout)
@@ -301,9 +301,9 @@ var _ = ginkgo.Describe("RedisCluster", func() {
301301
})
302302
})
303303

304-
ginkgo.Context("when delete sentinel deployment of the redis cluster", func() {
304+
ginkgo.Context("when delete sentinel statefulSet of the redis cluster", func() {
305305
ginkgo.BeforeEach(func() {
306-
err := f.K8sService.DeleteDeployment(rc.Namespace, util.GetSentinelName(rc))
306+
err := f.K8sService.DeleteStatefulSet(rc.Namespace, util.GetSentinelName(rc))
307307
gomega.Expect(err).NotTo(gomega.HaveOccurred())
308308
f.WaitRedisclusterHealthy(rc.Name, wailTime, defaultTimeout)
309309
})
@@ -544,9 +544,9 @@ func getRedisClusterNodeIPs(statefulSetName string) []string {
544544
return podIPs
545545
}
546546

547-
func getRedisClusterSentinelIPs(deploymentName string) []string {
547+
func getRedisClusterSentinelIPs(name string) []string {
548548
podIPs := []string{}
549-
podList, err := f.K8sService.GetDeploymentPods(f.Namespace(), deploymentName)
549+
podList, err := f.K8sService.GetStatefulSetPods(f.Namespace(), name)
550550
gomega.Expect(err).NotTo(gomega.HaveOccurred())
551551
for _, pod := range podList.Items {
552552
if pod.Status.Phase == corev1.PodRunning {

0 commit comments

Comments
 (0)