clean up properly

Author: Milla Samuel

e2e/test_operator_backups/operator_backup_test.go

@@ -78,33 +78,37 @@ var _ = AfterSuite(func() {
 
 var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
 	When("a cluster has backups enabled and then restored", func() {
-		var keyValues []fixtures.KeyValue
-		var prefix byte = 'a'
 		var backup *fixtures.FdbBackup
-		var restorableVersion uint64
 
 		BeforeEach(func() {
 			log.Println("creating backup for cluster")
 			backup = factory.CreateBackupForCluster(fdbCluster)
-			keyValues = fdbCluster.GenerateRandomValues(10, prefix)
-			fdbCluster.WriteKeyValues(keyValues)
-			restorableVersion = backup.WaitForRestorableVersion(fdbCluster.GetClusterVersion())
-			backup.Stop()
 		})
 
 		AfterEach(func() {
+			backup.Stop()
 			log.Println("deleting backup")
 			factory.Delete(backup.GetBackupPod())
 			backup = nil
 		})
 
 		It("should restore the cluster successfully", func() {
+			var prefix byte = 'a'
+			var keyValues []fixtures.KeyValue = fdbCluster.GenerateRandomValues(10, prefix)
+			fdbCluster.WriteKeyValues(keyValues)
+			backup.WaitForRestorableVersion(fdbCluster.GetClusterVersion())
+			backup.Stop()
 			fdbCluster.ClearRange([]byte{prefix}, 60)
 			factory.CreateRestoreForCluster(backup, nil)
 			Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))
 		})
 
 		It("should restore the cluster successfully with a restorable version", func() {
+			var prefix byte = 'a'
+			var keyValues []fixtures.KeyValue = fdbCluster.GenerateRandomValues(10, prefix)
+			fdbCluster.WriteKeyValues(keyValues)
+			var restorableVersion uint64 = backup.WaitForRestorableVersion(fdbCluster.GetClusterVersion())
+			backup.Stop()
 			fdbCluster.ClearRange([]byte{prefix}, 60)
 			factory.CreateRestoreForCluster(backup, &restorableVersion)
 			Expect(fdbCluster.GetRange([]byte{prefix}, 25, 60)).Should(Equal(keyValues))