correct number of compressed backup volumes in tests
authorChristian Herdtweck <christian.herdtweck@intra2net.com>
Fri, 10 Jun 2016 12:32:38 +0000 (14:32 +0200)
committerChristian Herdtweck <christian.herdtweck@intra2net.com>
Wed, 15 Jun 2016 11:18:03 +0000 (13:18 +0200)
testing/test_deltatar.py

index 0ceeacc..1590212 100644 (file)
@@ -168,8 +168,15 @@ class DeltaTarTest(BaseTest):
         assert os.path.exists("backup_dir")
         assert os.path.exists(os.path.join("backup_dir",
             deltatar.volume_name_func("backup_dir", True, 0)))
-        assert os.path.exists(os.path.join("backup_dir",
-            deltatar.volume_name_func("backup_dir", True, 1)))
+        if self.MODE_COMPRESSES:
+            n_vols = 1
+        else:
+            n_vols = 2
+        for i_vol in range(n_vols):
+            assert os.path.exists(os.path.join("backup_dir",
+                deltatar.volume_name_func("backup_dir", True, i_vol)))
+        assert not os.path.exists(os.path.join("backup_dir",
+            deltatar.volume_name_func("backup_dir", True, n_vols)))
 
         shutil.rmtree("source_dir2")
 
@@ -202,7 +209,7 @@ class DeltaTarTest(BaseTest):
 
         self.hash = dict()
         os.makedirs('source_dir2')
-        self.hash["source_dir2/big"]  = self.create_file("source_dir2/big", 4*1024*1024)
+        self.hash["source_dir2/big"]  = self.create_file("source_dir2/big", 3*1024*1024)
         self.hash["source_dir2/huge"]  = self.create_file("source_dir2/huge", 4*1024*1024)
         self.hash["source_dir2/huge2"]  = self.create_file("source_dir2/huge2", 4*1024*1024)
 
@@ -215,8 +222,15 @@ class DeltaTarTest(BaseTest):
         assert os.path.exists("backup_dir")
         assert os.path.exists(os.path.join("backup_dir",
             deltatar.volume_name_func("backup_dir", True, 0)))
-        assert os.path.exists(os.path.join("backup_dir",
-            deltatar.volume_name_func("backup_dir", True, 1)))
+        if self.MODE_COMPRESSES:
+            n_vols = 1
+        else:
+            n_vols = 6
+        for i_vol in range(n_vols):
+            assert os.path.exists(os.path.join("backup_dir",
+                deltatar.volume_name_func("backup_dir", True, i_vol)))
+        assert not os.path.exists(os.path.join("backup_dir",
+            deltatar.volume_name_func("backup_dir", True, n_vols)))
 
         shutil.rmtree("source_dir2")
 
@@ -351,8 +365,15 @@ class DeltaTarTest(BaseTest):
         assert os.path.exists("backup_dir")
         assert os.path.exists(os.path.join("backup_dir",
             deltatar.volume_name_func("backup_dir", True, 0)))
-        assert os.path.exists(os.path.join("backup_dir",
-            deltatar.volume_name_func("backup_dir", True, 1)))
+        if self.MODE_COMPRESSES:
+            n_vols = 1
+        else:
+            n_vols = 2
+        for i_vol in range(n_vols):
+            assert os.path.exists(os.path.join("backup_dir",
+                deltatar.volume_name_func("backup_dir", True, i_vol)))
+        assert not os.path.exists(os.path.join("backup_dir",
+            deltatar.volume_name_func("backup_dir", True, n_vols)))
 
         shutil.rmtree("source_dir2")