Correct operator backup tests for restorable version

Author: johscheuer

e2e/fixtures/fdb_restore.go

@@ -59,15 +59,12 @@ func (factory *Factory) CreateRestoreForCluster(
 				DestinationClusterName: backup.fdbCluster.Name(),
 				BlobStoreConfiguration: backup.backup.Spec.BlobStoreConfiguration,
 				CustomParameters:       backup.backup.Spec.CustomParameters,
+				BackupVersion:          backupVersion,
 			},
 		},
 		fdbCluster: backup.fdbCluster,
 	}
 
-	if backupVersion != nil {
-		restore.Spec.BackupVersion = backupVersion
-	}
-
 	gomega.Expect(factory.CreateIfAbsent(restore.restore)).NotTo(gomega.HaveOccurred())
 
 	factory.AddShutdownHook(func() error {

e2e/test_operator_backups/operator_backup_test.go

@@ -117,17 +117,26 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
 				)
 				backup.Stop()
 				fdbCluster.ClearRange([]byte{prefix}, 60)
-				restore = factory.CreateRestoreForCluster(backup, ptr.To(restorableVersion))
 			})
 
-			It("should restore the cluster successfully", func() {
-				Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))
+			When("no restorable version is specified", func() {
+				BeforeEach(func() {
+					restore = factory.CreateRestoreForCluster(backup, nil)
+				})
+
+				It("should restore the cluster successfully with a restorable version", func() {
+					Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))
+				})
 			})
 
-			It("should restore the cluster successfully with a restorable version", func() {
-				fdbCluster.ClearRange([]byte{prefix}, 60)
-				factory.CreateRestoreForCluster(backup, ptr.To(restorableVersion))
-				Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))
+			When("using a restorable version", func() {
+				BeforeEach(func() {
+					factory.CreateRestoreForCluster(backup, ptr.To(restorableVersion))
+				})
+
+				It("should restore the cluster successfully with a restorable version", func() {
+					Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))
+				})
 			})
 		})