@@ -68,8 +68,6 @@ var _ = BeforeSuite(func() {
68
68
69
69
// Create a blobstore for testing backups and restore
70
70
factory .CreateBlobstoreIfAbsent (fdbCluster .Namespace ())
71
-
72
- // Note: Encryption key secret is automatically created during namespace setup
73
71
})
74
72
75
73
var _ = AfterSuite (func () {
@@ -88,7 +86,6 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
88
86
// in the backup store.
89
87
AfterEach (func () {
90
88
backup .Destroy ()
91
- Expect (fdbCluster .WaitForReconciliation ()).To (Succeed ())
92
89
})
93
90
94
91
When ("the default backup system is used" , func () {
@@ -128,7 +125,7 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
128
125
})
129
126
})
130
127
131
- When ("the default backup system is used with encryption" , Serial , func () {
128
+ When ("the default backup system is used with encryption" , func () {
132
129
BeforeEach (func () {
133
130
log .Println ("creating encrypted backup for cluster" )
134
131
backup = factory .CreateBackupForCluster (
@@ -142,11 +139,11 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
142
139
fdbCluster .WriteKeyValues (keyValues )
143
140
backup .WaitForRestorableVersion (fdbCluster .GetClusterVersion ())
144
141
backup .Stop ()
142
+ fdbCluster .ClearRange ([]byte {prefix }, 60 )
143
+ restore = factory .CreateRestoreForCluster (backup )
145
144
})
146
145
147
146
It ("should restore the encrypted cluster successfully" , func () {
148
- fdbCluster .ClearRange ([]byte {prefix }, 60 )
149
- factory .CreateRestoreForCluster (backup )
150
147
Expect (fdbCluster .GetRange ([]byte {prefix }, 25 , 60 )).Should (Equal (keyValues ))
151
148
})
152
149
})
0 commit comments