Skip to content

Commit 91c0d40

Browse files
authored
Delete pod in persistence test (#475)
Before this commit, the persistence test wasn't testing persistence. This commit fixes a regression introduced in ca9e12f.
1 parent 06a015f commit 91c0d40

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

system_tests/system_tests.go

+9-5
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,14 @@ CONSOLE_LOG=new`
261261
Expect(rmqClusterClient.Delete(context.TODO(), cluster)).To(Succeed())
262262
})
263263

264-
It("persists messages after pod deletion", func() {
264+
It("persists messages", func() {
265265
By("publishing a message", func() {
266-
err := publishToQueue(hostname, port, username, password)
267-
Expect(err).NotTo(HaveOccurred())
266+
Expect(publishToQueue(hostname, port, username, password)).To(Succeed())
267+
})
268+
269+
By("deleting pod", func() {
270+
Expect(clientSet.CoreV1().Pods(namespace).Delete(ctx, statefulSetPodName(cluster, 0), metav1.DeleteOptions{})).To(Succeed())
271+
waitForRabbitmqUpdate(cluster)
268272
})
269273

270274
By("consuming a message after RabbitMQ was restarted", func() {
@@ -280,7 +284,7 @@ CONSOLE_LOG=new`
280284
pvcName := "persistence-" + statefulSetPodName(cluster, 0)
281285
pvc, err := clientSet.CoreV1().PersistentVolumeClaims(namespace).Get(ctx, pvcName, metav1.GetOptions{})
282286
Expect(err).NotTo(HaveOccurred())
283-
Expect(len(pvc.OwnerReferences)).To(Equal(1))
287+
Expect(pvc.OwnerReferences).To(HaveLen(1))
284288
Expect(pvc.OwnerReferences[0].Name).To(Equal(cluster.Name))
285289
})
286290
})
@@ -347,7 +351,7 @@ CONSOLE_LOG=new`
347351
Expect(updateRabbitmqCluster(ctx, rmqClusterClient, cluster.Name, cluster.Namespace, func(cluster *rabbitmqv1beta1.RabbitmqCluster) {
348352
cluster.Spec.TLS.SecretName = "rabbitmq-tls-test-secret"
349353
})).To(Succeed())
350-
waitForTLSUpdate(cluster)
354+
waitForRabbitmqUpdate(cluster)
351355
})
352356

353357
AfterEach(func() {

system_tests/utils.go

-5
Original file line numberDiff line numberDiff line change
@@ -491,11 +491,6 @@ func rabbitmqNodePort(ctx context.Context, clientSet *kubernetes.Clientset, clus
491491
return ""
492492
}
493493

494-
func waitForTLSUpdate(cluster *rabbitmqv1beta1.RabbitmqCluster) {
495-
waitForRabbitmqNotRunningWithOffset(cluster, 2)
496-
waitForRabbitmqRunning(cluster)
497-
}
498-
499494
func waitForRabbitmqUpdate(cluster *rabbitmqv1beta1.RabbitmqCluster) {
500495
waitForRabbitmqNotRunningWithOffset(cluster, 2)
501496
waitForRabbitmqRunningWithOffset(cluster, 2)

0 commit comments

Comments
 (0)