Still refactoring for 0.11.1 - prepare to rename highlevel

git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@253 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109

4 files changed, 42 insertions, 41 deletions

diff --git a/rdiff-backup/testing/commontest.py b/rdiff-backup/testing/commontest.py
index 0f25e0d..19b2c60 100644
--- a/rdiff-backup/testing/commontest.py
+++ b/rdiff-backup/testing/commontest.py
@@ -131,7 +131,7 @@ def InternalRestore(mirror_local, dest_local, mirror_dir, dest_dir, time):
 				   % (SourceDir, dest_dir)
 
 	mirror_rp, dest_rp = cmd_schemas2rps([mirror_dir, dest_dir], remote_schema)
-	Time.setcurtime()
+	Main.misc_setup([mirror_rp, dest_rp])
 	inc = get_increment_rp(mirror_rp, time)
 	if inc: Main.Restore(get_increment_rp(mirror_rp, time), dest_rp)
 	else: # use alternate syntax
diff --git a/rdiff-backup/testing/hardlinktest.py b/rdiff-backup/testing/hardlinktest.py
index 33e43ed..2b70ed4 100644
--- a/rdiff-backup/testing/hardlinktest.py
+++ b/rdiff-backup/testing/hardlinktest.py
@@ -1,18 +1,21 @@
+
 import os, unittest
 from commontest import *
-from rdiff_backup.rpath import *
-from rdiff_backup import Globals, Hardlink
+from rdiff_backup import Globals, Hardlink, selection, rpath
 
 Log.setverbosity(7)
 
 class HardlinkTest(unittest.TestCase):
 	"""Test cases for Hard links"""
-	outputrp = RPath(Globals.local_connection, "testfiles/output")
-	hardlink_dir1 = RPath(Globals.local_connection, "testfiles/hardlinks/dir1")
-	hardlink_dir1copy = \
-		RPath(Globals.local_connection, "testfiles/hardlinks/dir1copy")
-	hardlink_dir2 = RPath(Globals.local_connection, "testfiles/hardlinks/dir2")
-	hardlink_dir3 = RPath(Globals.local_connection, "testfiles/hardlinks/dir3")
+	outputrp = rpath.RPath(Globals.local_connection, "testfiles/output")
+	hardlink_dir1 = rpath.RPath(Globals.local_connection,
+								"testfiles/hardlinks/dir1")
+	hardlink_dir1copy = rpath.RPath(Globals.local_connection,
+									"testfiles/hardlinks/dir1copy")
+	hardlink_dir2 = rpath.RPath(Globals.local_connection,
+								"testfiles/hardlinks/dir2")
+	hardlink_dir3 = rpath.RPath(Globals.local_connection,
+								"testfiles/hardlinks/dir3")
 
 	def reset_output(self):
 		"""Erase and recreate testfiles/output directory"""
@@ -73,7 +76,7 @@ class HardlinkTest(unittest.TestCase):
 		"""See if the partial inode dictionary is correct"""
 		Globals.preserve_hardlinks = 1
 		reset_hardlink_dicts()
-		for dsrp in Select(DSRPath(1, self.hardlink_dir3)).set_iter():
+		for dsrp in selection.Select(self.hardlink_dir3).set_iter():
 			Hardlink.add_rorp(dsrp, 1)
 		
 		assert len(Hardlink._src_inode_indicies.keys()) == 3, \
@@ -90,7 +93,7 @@ class HardlinkTest(unittest.TestCase):
 		"""Same as testBuildingDict but test destination building"""
 		Globals.preserve_hardlinks = 1
 		reset_hardlink_dicts()
-		for dsrp in Select(DSRPath(None, self.hardlink_dir3)).set_iter():
+		for dsrp in selection.Select(self.hardlink_dir3).set_iter():
 			Hardlink.add_rorp(dsrp, None)
 		
 		assert len(Hardlink._dest_inode_indicies.keys()) == 3, \
@@ -106,7 +109,7 @@ class HardlinkTest(unittest.TestCase):
 	def testCompletedDict(self):
 		"""See if the hardlink dictionaries are built correctly"""
 		reset_hardlink_dicts()
-		for dsrp in Select(DSRPath(1, self.hardlink_dir1)).set_iter():
+		for dsrp in selection.Select(self.hardlink_dir1).set_iter():
 			Hardlink.add_rorp(dsrp, 1)
 		assert Hardlink._src_inode_indicies == {}, \
 			   Hardlink._src_inode_indicies
@@ -119,7 +122,7 @@ class HardlinkTest(unittest.TestCase):
 		assert Hardlink._src_index_indicies == dict
 
 		reset_hardlink_dicts()
-		for dsrp in Select(DSRPath(1, self.hardlink_dir2)).set_iter():
+		for dsrp in selection.Select(self.hardlink_dir2).set_iter():
 			Hardlink.add_rorp(dsrp, 1)
 		assert Hardlink._src_inode_indicies == {}, \
 			   Hardlink._src_inode_indicies
diff --git a/rdiff-backup/testing/regressiontest.py b/rdiff-backup/testing/regressiontest.py
index 0391f95..57b57ab 100644
--- a/rdiff-backup/testing/regressiontest.py
+++ b/rdiff-backup/testing/regressiontest.py
@@ -166,8 +166,7 @@ class IncrementTest2(PathSetter):
 		recovery_out = self.get_dest_rp('testfiles/recovery_out_backup')
 		recovery_inc = self.get_dest_rp('testfiles/recovery_out_backup/'
 										'rdiff-backup-data/increments')
-		HighLevel.Mirror_and_increment(recovery_in, recovery_out,
-									   recovery_inc)
+		highlevel.Mirror_and_increment(recovery_in, recovery_out, recovery_inc)
 		# Should probably check integrity of increments, but for now
 		# allow if it doesn't during the Mirror_and_increment
 
@@ -183,56 +182,54 @@ class IncrementTest2(PathSetter):
 		recovery_out = self.get_dest_rp('testfiles/recovery_out_backup')
 		recovery_inc = self.get_dest_rp('testfiles/recovery_out_backup/'
 										'rdiff-backup-data/increments')
-		HighLevel.Mirror_and_increment(recovery_in, recovery_out,
-									   recovery_inc)
+		highlevel.Mirror_and_increment(recovery_in, recovery_out, recovery_inc)
 		# Should probably check integrity of increments, but for now
 		# allow if it doesn't during the Mirror_and_increment
 
 	def runtest(self):
 		"""After setting connections, etc., run actual test using this"""
 		Time.setcurtime()
-		SaveState.init_filenames()
 
-		Main.backup_init_select(Local.inc1rp, Local.rpout)
-		HighLevel.Mirror(self.inc1rp, self.rpout)
+		Main.backup_set_select(Local.inc1rp)
+		highlevel.Mirror(self.inc1rp, self.rpout)
 		assert CompareRecursive(Local.inc1rp, Local.rpout)
 
 		Time.setcurtime()
 		Time.setprevtime(999500000)
-		Main.backup_init_select(self.inc2rp, self.rpout)
-		HighLevel.Mirror_and_increment(self.inc2rp, self.rpout, self.rpout_inc)
+		Main.backup_set_select(self.inc2rp)
+		highlevel.Mirror_and_increment(self.inc2rp, self.rpout, self.rpout_inc)
 		assert CompareRecursive(Local.inc2rp, Local.rpout)
 
 		Time.setcurtime()
 		Time.setprevtime(999510000)
-		Main.backup_init_select(self.inc3rp, self.rpout)
-		HighLevel.Mirror_and_increment(self.inc3rp, self.rpout, self.rpout_inc)
+		Main.backup_set_select(self.inc3rp)
+		highlevel.Mirror_and_increment(self.inc3rp, self.rpout, self.rpout_inc)
 		assert CompareRecursive(Local.inc3rp, Local.rpout)
 
 		Time.setcurtime()
 		Time.setprevtime(999520000)
-		Main.backup_init_select(self.inc4rp, self.rpout)
-		HighLevel.Mirror_and_increment(self.inc4rp, self.rpout, self.rpout_inc)
+		Main.backup_set_select(self.inc4rp)
+		highlevel.Mirror_and_increment(self.inc4rp, self.rpout, self.rpout_inc)
 		assert CompareRecursive(Local.inc4rp, Local.rpout)
 		
 
 		print "Restoring to self.inc4"
-		HighLevel.Restore(999530000, self.rpout, self.get_inctup(),
+		highlevel.Restore(999530000, self.rpout, self.get_inctup(),
 						  self.rpout4)
 		assert CompareRecursive(Local.inc4rp, Local.rpout4)
 
 		print "Restoring to self.inc3"
-		HighLevel.Restore(999520000, self.rpout, self.get_inctup(),
+		highlevel.Restore(999520000, self.rpout, self.get_inctup(),
 						  self.rpout3)
 		assert CompareRecursive(Local.inc3rp, Local.rpout3)
 
 		print "Restoring to self.inc2"
-		HighLevel.Restore(999510000, self.rpout, self.get_inctup(),
+		highlevel.Restore(999510000, self.rpout, self.get_inctup(),
 						  self.rpout2)
 		assert CompareRecursive(Local.inc2rp, Local.rpout2)
 
 		print "Restoring to self.inc1"
-		HighLevel.Restore(999500000, self.rpout, self.get_inctup(),
+		highlevel.Restore(999500000, self.rpout, self.get_inctup(),
 						  self.rpout1)
 		assert CompareRecursive(Local.inc1rp, Local.rpout1)
 
@@ -296,7 +293,6 @@ class MirrorTest(PathSetter):
 		self.setPathnames(None, None, None, None)
 		Globals.change_source_perms = None
 		Time.setcurtime()
-		SaveState.init_filenames()
 		self.Mirror(self.one_unreadable, self.one_unreadable_out)
 		Globals.change_source_perms = 1
 		self.Mirror(self.one_unreadable, self.one_unreadable_out)
@@ -307,7 +303,6 @@ class MirrorTest(PathSetter):
 		self.setPathnames('test1', '../', 'test2/tmp', '../../')
 		Globals.change_source_perms = None
 		Time.setcurtime()
-		SaveState.init_filenames()
 		self.Mirror(self.one_unreadable, self.one_unreadable_out)
 		Globals.change_source_perms = 1
 		self.Mirror(self.one_unreadable, self.one_unreadable_out)
@@ -322,7 +317,7 @@ class MirrorTest(PathSetter):
 		Globals.change_ownership = 1
 		self.refresh(self.rootfiles, self.rootfiles_out,
 				Local.rootfiles, Local.rootfiles_out) # add uid/gid info
-		HighLevel.Mirror(self.rootfiles, self.rootfiles_out)
+		highlevel.Mirror(self.rootfiles, self.rootfiles_out)
 		assert CompareRecursive(Local.rootfiles, Local.rootfiles_out)
 		Globals.change_ownership = None
 		self.refresh(self.rootfiles, self.rootfiles_out,
@@ -335,7 +330,7 @@ class MirrorTest(PathSetter):
 			conn.Globals.set('change_ownership', 1)
 		self.refresh(self.rootfiles, self.rootfiles_out,
 				Local.rootfiles, Local.rootfiles_out) # add uid/gid info
-		HighLevel.Mirror(self.rootfiles, self.rootfiles_out)
+		highlevel.Mirror(self.rootfiles, self.rootfiles_out)
 		assert CompareRecursive(Local.rootfiles, Local.rootfiles_out)
 		for coon in Globals.connections:
 			conn.Globals.set('change_ownership', None)
@@ -377,7 +372,6 @@ class MirrorTest(PathSetter):
 		
 	def runtest(self):
 		Time.setcurtime()
-		SaveState.init_filenames()
 		assert self.rbdir.lstat()
 		self.Mirror(self.inc1rp, self.rpout)
 		assert CompareRecursive(Local.inc1rp, Local.rpout)
@@ -388,11 +382,11 @@ class MirrorTest(PathSetter):
 		assert CompareRecursive(Local.inc2rp, Local.rpout)
 
 	def run_partial_test(self):
-		os.system("cp -a testfiles/increment3 testfiles/output")
+		assert not os.system("rm -rf testfiles/output")
+		assert not os.system("cp -a testfiles/increment3 testfiles/output")
 		self.reset_rps()
 
 		Time.setcurtime()
-		SaveState.init_filenames()
 		self.Mirror(self.inc1rp, self.rpout)
 		#rpath.RPath.copy_attribs(self.inc1rp, self.rpout)
 		assert CompareRecursive(Local.inc1rp, Local.rpout)
@@ -401,10 +395,13 @@ class MirrorTest(PathSetter):
 		assert CompareRecursive(Local.inc2rp, Local.rpout)
 
 	def Mirror(self, rpin, rpout):
-		"""Like HighLevel.Mirror, but run misc_setup first"""
+		"""Like highlevel.Mirror, but run misc_setup first"""
+		Main.force = 1
 		Main.misc_setup([rpin, rpout])
-		Main.backup_init_select(rpin, rpout)
-		HighLevel.Mirror(rpin, rpout,
-						 rpout.append_path("rdiff-backup-data/increments"))
+		Main.backup_set_select(rpin)
+		Main.backup_init_dirs(rpin, rpout)
+		highlevel.Mirror(rpin, rpout)
+		Log.close_logfile()
+		Hardlink.clear_dictionaries()
 
 if __name__ == "__main__": unittest.main()
diff --git a/rdiff-backup/testing/restoretest.py b/rdiff-backup/testing/restoretest.py
index 6198ccb..9cb6ebb 100644
--- a/rdiff-backup/testing/restoretest.py
+++ b/rdiff-backup/testing/restoretest.py
@@ -33,6 +33,7 @@ class RestoreTest(unittest.TestCase):
 		tuples, incs = self.maketesttuples(basename)
 		rpbase = rpath.RPath(lc, self.prefix + basename)
 		rptarget = rpath.RPath(lc, "testfiles/outfile")
+		Hardlink.initialize_dictionaries()
 
 		for pair in tuples:
 			print "Processing file " + pair[0].path