Skip to content

Commit 5469188

Browse files
fix Failures
1 parent 3deabc9 commit 5469188

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

e2e/test_operator_backups/operator_backup_test.go

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ var _ = BeforeSuite(func() {
6868

6969
// Create a blobstore for testing backups and restore
7070
factory.CreateBlobstoreIfAbsent(fdbCluster.Namespace())
71-
72-
// Note: Encryption key secret is automatically created during namespace setup
7371
})
7472

7573
var _ = AfterSuite(func() {
@@ -89,10 +87,9 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
8987
// in the backup store.
9088
AfterEach(func() {
9189
backup.Destroy()
92-
Expect(fdbCluster.WaitForReconciliation()).To(Succeed())
9390
})
9491

95-
When("the default backup system is used", Serial, func() {
92+
When("the default backup system is used", func() {
9693
BeforeEach(func() {
9794
log.Println("creating backup for cluster")
9895
backup = factory.CreateBackupForCluster(
@@ -114,7 +111,7 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
114111
})
115112
})
116113

117-
When("the default backup system is used with encryption", Serial, func() {
114+
When("the default backup system is used with encryption", func() {
118115
BeforeEach(func() {
119116
log.Println("creating encrypted backup for cluster")
120117
backup = factory.CreateBackupForCluster(
@@ -128,11 +125,11 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
128125
fdbCluster.WriteKeyValues(keyValues)
129126
backup.WaitForRestorableVersion(fdbCluster.GetClusterVersion())
130127
backup.Stop()
128+
fdbCluster.ClearRange([]byte{prefix}, 60)
129+
restore = factory.CreateRestoreForCluster(backup)
131130
})
132131

133132
It("should restore the encrypted cluster successfully", func() {
134-
fdbCluster.ClearRange([]byte{prefix}, 60)
135-
factory.CreateRestoreForCluster(backup)
136133
Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))
137134
})
138135
})

0 commit comments

Comments
 (0)