@@ -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 () {
@@ -89,10 +87,9 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
89
87
// in the backup store.
90
88
AfterEach (func () {
91
89
backup .Destroy ()
92
- Expect (fdbCluster .WaitForReconciliation ()).To (Succeed ())
93
90
})
94
91
95
- When ("the default backup system is used" , Serial , func () {
92
+ When ("the default backup system is used" , func () {
96
93
BeforeEach (func () {
97
94
log .Println ("creating backup for cluster" )
98
95
backup = factory .CreateBackupForCluster (
@@ -114,7 +111,7 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
114
111
})
115
112
})
116
113
117
- When ("the default backup system is used with encryption" , Serial , func () {
114
+ When ("the default backup system is used with encryption" , func () {
118
115
BeforeEach (func () {
119
116
log .Println ("creating encrypted backup for cluster" )
120
117
backup = factory .CreateBackupForCluster (
@@ -128,11 +125,11 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
128
125
fdbCluster .WriteKeyValues (keyValues )
129
126
backup .WaitForRestorableVersion (fdbCluster .GetClusterVersion ())
130
127
backup .Stop ()
128
+ fdbCluster .ClearRange ([]byte {prefix }, 60 )
129
+ restore = factory .CreateRestoreForCluster (backup )
131
130
})
132
131
133
132
It ("should restore the encrypted cluster successfully" , func () {
134
- fdbCluster .ClearRange ([]byte {prefix }, 60 )
135
- factory .CreateRestoreForCluster (backup )
136
133
Expect (fdbCluster .GetRange ([]byte {prefix }, 25 , 60 )).Should (Equal (keyValues ))
137
134
})
138
135
})
0 commit comments