Skip to content

Commit 3c967f8

Browse files
committed
creating one test instead of two
1 parent 9887f9d commit 3c967f8

File tree

1 file changed

+9
-25
lines changed

1 file changed

+9
-25
lines changed

e2e/test_operator_backups/operator_backup_test.go

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@ This test suite contains tests related to backup and restore with the operator.
2525
*/
2626

2727
import (
28-
"encoding/json"
29-
"log"
30-
3128
fdbv1beta2 "github.com/FoundationDB/fdb-kubernetes-operator/v2/api/v1beta2"
3229
"github.com/FoundationDB/fdb-kubernetes-operator/v2/e2e/fixtures"
3330
. "github.com/onsi/ginkgo/v2"
3431
. "github.com/onsi/gomega"
3532
corev1 "k8s.io/api/core/v1"
3633
"k8s.io/utils/ptr"
34+
"log"
3735
)
3836

3937
var (
@@ -173,24 +171,19 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
173171
})
174172

175173
When("running describe command", func() {
176-
var describeOutput string
177-
178174
BeforeEach(func() {
179175
skipRestore = true
180176
})
181177

182178
JustBeforeEach(func() {
183-
describeOutput = backup.RunDescribeCommand()
184-
})
185-
186-
// TODO (09harsh): Enable this test when we have the fileLevelEncryption in json parser
187-
// here: https://github.com/apple/foundationdb/blob/main/fdbclient/BackupContainer.actor.cpp#L193-L250
188-
PIt("should have file level encryption enabled", func() {
189-
var describeData map[string]interface{}
190-
err := json.Unmarshal([]byte(describeOutput), &describeData)
191-
Expect(err).NotTo(HaveOccurred())
192-
fileLevelEncryption := describeData["FileLevelEncryption"].(bool)
193-
Expect(fileLevelEncryption).To(BeTrue())
179+
_ = backup.RunDescribeCommand()
180+
// TODO (09harsh): Uncomment this when we have the fileLevelEncryption in json parser
181+
// here: https://github.com/apple/foundationdb/blob/main/fdbclient/BackupContainer.actor.cpp#L193-L250
182+
//var describeData map[string]interface{}
183+
//err := json.Unmarshal([]byte(describeCommandOutput), &describeData)
184+
//Expect(err).NotTo(HaveOccurred())
185+
//fileLevelEncryption := describeData["FileLevelEncryption"].(bool)
186+
//Expect(fileLevelEncryption).To(BeTrue())
194187
})
195188

196189
It(
@@ -206,15 +199,6 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
206199
},
207200
)
208201
})
209-
210-
It(
211-
"should restore the cluster successfully with a restorable version",
212-
func() {
213-
Expect(
214-
fdbCluster.GetRange([]byte{prefix}, 25, 60),
215-
).Should(Equal(keyValues))
216-
},
217-
)
218202
})
219203

220204
// TODO (johscheuer): Enable test once the CRD in CI is updated.

0 commit comments

Comments
 (0)