From ebdb129500acc906d1d9b232ad495917035bec18 Mon Sep 17 00:00:00 2001 From: Christian Herdtweck Date: Wed, 22 Jun 2016 18:17:16 +0200 Subject: [PATCH] use different DeltaTar object to restore than to create backups --- testing/test_deltatar.py | 31 ++++++++++++++++++++++--------- 1 files changed, 22 insertions(+), 9 deletions(-) diff --git a/testing/test_deltatar.py b/testing/test_deltatar.py index 8c8f67b..6c96c50 100644 --- a/testing/test_deltatar.py +++ b/testing/test_deltatar.py @@ -157,7 +157,6 @@ class DeltaTarTest(BaseTest): deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD, logger=self.consoleLogger) - self.hash = dict() os.makedirs('source_dir2') self.hash["source_dir2/big"] = self.create_file("source_dir2/big", 100000) @@ -186,10 +185,14 @@ class DeltaTarTest(BaseTest): tar_filename = deltatar.volume_name_func('backup_dir', True, 0) tar_path = os.path.join("backup_dir", tar_filename) + del deltatar + + restore_deltar = DeltaTar(mode=self.MODE, password=self.PASSWORD, + logger=self.consoleLogger) # this should automatically restore all volumes - deltatar.restore_backup(target_path="source_dir2", - backup_tar_path=tar_path) + restore_deltar.restore_backup(target_path="source_dir2", + backup_tar_path=tar_path) for key, value in self.hash.items(): assert os.path.exists(key) @@ -241,7 +244,12 @@ class DeltaTarTest(BaseTest): index_filename = deltatar.index_name_func(True) index_path = os.path.join("backup_dir", index_filename) - deltatar.restore_backup(target_path="source_dir2", + del deltatar + + restore_deltar = DeltaTar(mode=self.MODE, password=self.PASSWORD, + logger=self.consoleLogger) + + restore_deltar.restore_backup(target_path="source_dir2", backup_indexes_paths=[index_path]) for key, value in self.hash.items(): @@ -335,9 +343,12 @@ class DeltaTarTest(BaseTest): tar_filename = deltatar.volume_name_func('backup_dir', True, 0) tar_path = os.path.join("backup_dir", tar_filename) + restore_deltar = DeltaTar(mode=self.MODE, password=self.PASSWORD, + logger=self.consoleLogger) + # this should automatically restore all volumes - deltatar.restore_backup(target_path="source_dir2", - backup_tar_path=tar_path) + restore_deltar.restore_backup(target_path="source_dir2", + backup_tar_path=tar_path) self.check_equal_dirs(self.GIT_DIR, 'source_dir2', deltatar) @@ -354,7 +365,6 @@ class DeltaTarTest(BaseTest): deltatar = DeltaTar(mode=self.MODE, password=self.PASSWORD, logger=self.consoleLogger) - self.hash = dict() os.makedirs('source_dir2') self.hash["source_dir2/big"] = self.create_file("source_dir2/big", 100000) @@ -477,7 +487,11 @@ class DeltaTarTest(BaseTest): index_filename = deltatar.index_name_func(True) index_path = os.path.join("backup_dir", index_filename) - deltatar.restore_backup(target_path="source_dir", + del deltatar + restore_deltar = DeltaTar(mode=self.MODE, password=self.PASSWORD, + logger=self.consoleLogger) + + restore_deltar.restore_backup(target_path="source_dir", backup_indexes_paths=[index_path]) for key, value in self.hash.items(): @@ -1068,7 +1082,6 @@ class DeltaTarTest(BaseTest): backup_tar_path=tar_path) assert len(os.listdir("source_dir")) == 0 - def test_create_diff_backup1(self): ''' Creates a diff backup when there are new files -- 1.7.1