From 82f75df4f397486b1eda4e4dc52966df31312239 Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Fri, 10 Jun 2016 14:32:38 +0200 Subject: [PATCH] correct number of compressed backup volumes in tests --- testing/test_deltatar.py | 35 ++++++++++++++++++++++++++++------- 1 files changed, 28 insertions(+), 7 deletions(-) diff --git a/testing/test_deltatar.py b/testing/test_deltatar.py index 0ceeacc..1590212 100644 --- a/testing/test_deltatar.py +++ b/testing/test_deltatar.py @@ -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") -- 1.7.1