diff options
Diffstat (limited to 'rdiff-backup/testing')
25 files changed, 120 insertions, 105 deletions
diff --git a/rdiff-backup/testing/chdir-wrapper b/rdiff-backup/testing/chdir-wrapper index 073b297..1d0db7d 100755 --- a/rdiff-backup/testing/chdir-wrapper +++ b/rdiff-backup/testing/chdir-wrapper @@ -9,10 +9,8 @@ the server. Otherwise will start the server without a chdir. import os, sys -#execfile("commontest.py") -#rbexec("setconnections.py") - if len(sys.argv) > 1: os.chdir(sys.argv[1]) #PipeConnection(sys.stdin, sys.stdout).Server() -os.system("/home/ben/prog/python/rdiff-backup/src/rdiff-backup --server") +#os.system("/home/ben/prog/python/rdiff-backup/rdiff-backup --server") +os.system("/home/ben/prog/python/rdiff-backup/testing/server.py /home/ben/prog/python/rdiff-backup/src") diff --git a/rdiff-backup/testing/chdir-wrapper2 b/rdiff-backup/testing/chdir-wrapper2 new file mode 100755 index 0000000..7fc1312 --- /dev/null +++ b/rdiff-backup/testing/chdir-wrapper2 @@ -0,0 +1,16 @@ +#!/usr/bin/env python + +"""Used to emulate a remote connection by changing directories. + +Like chdir-wrapper, but this time run the 'rdiff-backup' script, not +some other special thing. + +""" + +import os, sys + +if len(sys.argv) > 1: os.chdir(sys.argv[1]) +#PipeConnection(sys.stdin, sys.stdout).Server() + +os.system("/home/ben/prog/python/rdiff-backup/rdiff-backup --server") + diff --git a/rdiff-backup/testing/commontest.py b/rdiff-backup/testing/commontest.py index 04f2a8a..24eb2cb 100644 --- a/rdiff-backup/testing/commontest.py +++ b/rdiff-backup/testing/commontest.py @@ -1,5 +1,10 @@ """commontest - Some functions and constants common to several test cases""" -import os +import os, sys +sys.path.insert(0, "../src") +from rpath import * +from destructive_stepping import * +from highlevel import * +import Globals, Hardlink, SetConnections, Main SourceDir = "../src" AbsCurdir = os.getcwd() # Absolute path name of current directory @@ -7,12 +12,6 @@ AbsTFdir = AbsCurdir+"/testfiles" MiscDir = "../misc" __no_execute__ = 1 # Keeps the actual rdiff-backup program from running -def rbexec(src_file): - """Changes to the source directory, execfile src_file, return""" - os.chdir(SourceDir) - execfile(src_file, globals()) - os.chdir(AbsCurdir) - def Myrm(dirstring): """Run myrm on given directory string""" assert not os.system("%s/myrm %s" % (MiscDir, dirstring)) @@ -77,9 +76,9 @@ def InternalBackup(source_local, dest_local, src_dir, dest_dir, % (SourceDir, dest_dir) rpin, rpout = SetConnections.InitRPs([src_dir, dest_dir], remote_schema) - _get_main().misc_setup([rpin, rpout]) - _get_main().Backup(rpin, rpout) - _get_main().cleanup() + Main.misc_setup([rpin, rpout]) + Main.Backup(rpin, rpout) + Main.cleanup() def InternalMirror(source_local, dest_local, src_dir, dest_dir, write_data = None): @@ -94,8 +93,8 @@ def InternalMirror(source_local, dest_local, src_dir, dest_dir, % (SourceDir, dest_dir) rpin, rpout = SetConnections.InitRPs([src_dir, dest_dir], remote_schema) - _get_main().misc_setup([rpin, rpout]) - _get_main().backup_init_select(rpin, rpout) + Main.misc_setup([rpin, rpout]) + Main.backup_init_select(rpin, rpout) if not rpout.lstat(): rpout.mkdir() if write_data: # use rdiff-backup-data dir to checkpoint data_dir = rpout.append("rdiff-backup-data") @@ -109,7 +108,7 @@ def InternalMirror(source_local, dest_local, src_dir, dest_dir, SaveState.init_filenames() HighLevel.Mirror(rpin, rpout, Globals.rbdir.append("increments")) else: HighLevel.Mirror(rpin, rpout) - _get_main().cleanup() + Main.cleanup() def InternalRestore(mirror_local, dest_local, mirror_dir, dest_dir, time): """Restore mirror_dir to dest_dir at given time @@ -132,12 +131,11 @@ def InternalRestore(mirror_local, dest_local, mirror_dir, dest_dir, time): remote_schema) Time.setcurtime() inc = get_increment_rp(mirror_rp, time) - if inc: - _get_main().Restore(get_increment_rp(mirror_rp, time), dest_rp) + if inc: Main.restore(get_increment_rp(mirror_rp, time), dest_rp) else: # use alternate syntax - _get_main().restore_timestr = str(time) - _get_main().RestoreAsOf(mirror_rp, dest_rp) - _get_main().cleanup() + Main.restore_timestr = str(time) + Main.RestoreAsOf(mirror_rp, dest_rp) + Main.cleanup() def get_increment_rp(mirror_rp, time): """Return increment rp matching time in seconds""" @@ -154,14 +152,7 @@ def _reset_connections(src_rp, dest_rp): #Globals.connections = [Globals.local_connection] #Globals.connection_dict = {0: Globals.local_connection} SetConnections.UpdateGlobal('rbdir', None) - _get_main().misc_setup([src_rp, dest_rp]) - -def _get_main(): - """Set Globals.Main if it doesn't exist, and return""" - try: return Globals.Main - except AttributeError: - Globals.Main = Main() - return Globals.Main + Main.misc_setup([src_rp, dest_rp]) def CompareRecursive(src_rp, dest_rp, compare_hardlinks = 1, equality_func = None, exclude_rbdir = 1, diff --git a/rdiff-backup/testing/connectiontest.py b/rdiff-backup/testing/connectiontest.py index dfac612..61a75f4 100644 --- a/rdiff-backup/testing/connectiontest.py +++ b/rdiff-backup/testing/connectiontest.py @@ -1,7 +1,7 @@ import unittest, types, tempfile, os, sys -execfile("commontest.py") -rbexec("setconnections.py") - +from commontest import * +from connection import * +import Globals class LocalConnectionTest(unittest.TestCase): """Test the dummy connection""" diff --git a/rdiff-backup/testing/destructive_steppingtest.py b/rdiff-backup/testing/destructive_steppingtest.py index 1194835..ab1c23b 100644 --- a/rdiff-backup/testing/destructive_steppingtest.py +++ b/rdiff-backup/testing/destructive_steppingtest.py @@ -1,7 +1,9 @@ from __future__ import generators import unittest -execfile("commontest.py") -rbexec("selection.py") +from commontest import * +from rpath import * +from selection import * +import Globals Log.setverbosity(4) diff --git a/rdiff-backup/testing/finaltest.py b/rdiff-backup/testing/finaltest.py index 150d5ac..0a51485 100644 --- a/rdiff-backup/testing/finaltest.py +++ b/rdiff-backup/testing/finaltest.py @@ -1,12 +1,13 @@ import unittest, os, re, sys -execfile("commontest.py") -rbexec("restore.py") +from commontest import * +from log import * +from rpath import * +import Globals """Regression tests""" Globals.exclude_mirror_regexps = [re.compile(".*/rdiff-backup-data")] Log.setverbosity(7) -Make() lc = Globals.local_connection @@ -43,7 +44,7 @@ class PathSetter(unittest.TestCase): def reset_schema(self): self.rb_schema = SourceDir + \ - "/rdiff-backup -v3 --remote-schema './chdir-wrapper %s' " + "/../rdiff-backup -v3 --remote-schema './chdir-wrapper2 %s' " def refresh(self, *rp_list): """Reread data for the given rps""" diff --git a/rdiff-backup/testing/hardlinktest.py b/rdiff-backup/testing/hardlinktest.py index a45e427..9e6bdf9 100644 --- a/rdiff-backup/testing/hardlinktest.py +++ b/rdiff-backup/testing/hardlinktest.py @@ -1,7 +1,7 @@ import os, unittest -execfile("commontest.py") -rbexec("main.py") - +from commontest import * +from rpath import * +import Globals, Hardlink Log.setverbosity(7) diff --git a/rdiff-backup/testing/highleveltest.py b/rdiff-backup/testing/highleveltest.py index 1b79b90..8f24f9d 100644 --- a/rdiff-backup/testing/highleveltest.py +++ b/rdiff-backup/testing/highleveltest.py @@ -1,8 +1,6 @@ import unittest - -execfile("commontest.py") -rbexec("main.py") - +from commontest import * +import Globals, SetConnections class RemoteMirrorTest(unittest.TestCase): """Test mirroring""" diff --git a/rdiff-backup/testing/incrementtest.py b/rdiff-backup/testing/incrementtest.py index ecafa70..5562fdd 100644 --- a/rdiff-backup/testing/incrementtest.py +++ b/rdiff-backup/testing/incrementtest.py @@ -1,8 +1,8 @@ import unittest, os - -execfile("commontest.py") -rbexec("main.py") - +from commontest import * +from log import * +from rpath import * +from restore import * lc = Globals.local_connection Globals.change_source_perms = 1 diff --git a/rdiff-backup/testing/iterfiletest.py b/rdiff-backup/testing/iterfiletest.py index 38dca4d..62f622a 100644 --- a/rdiff-backup/testing/iterfiletest.py +++ b/rdiff-backup/testing/iterfiletest.py @@ -1,6 +1,6 @@ import unittest, StringIO -execfile("commontest.py") -rbexec("iterfile.py") +from commontest import * +from iterfile import * class testIterFile(unittest.TestCase): diff --git a/rdiff-backup/testing/killtest.py b/rdiff-backup/testing/killtest.py index d0b1b40..5b9a836 100644 --- a/rdiff-backup/testing/killtest.py +++ b/rdiff-backup/testing/killtest.py @@ -1,6 +1,7 @@ import unittest, os, signal, sys, random, time -execfile("commontest.py") -rbexec("main.py") +from commontest import * +from log import * +import Globals, Main """Test consistency by killing rdiff-backup as it is backing up""" diff --git a/rdiff-backup/testing/lazytest.py b/rdiff-backup/testing/lazytest.py index 83f4d20..d0b743c 100644 --- a/rdiff-backup/testing/lazytest.py +++ b/rdiff-backup/testing/lazytest.py @@ -1,8 +1,7 @@ from __future__ import generators import unittest, pickle - -execfile("commontest.py") -rbexec("robust.py") +from commontest import * +from lazy import * class Iterators(unittest.TestCase): one_to_100 = lambda s: iter(range(1, 101)) diff --git a/rdiff-backup/testing/rdifftest.py b/rdiff-backup/testing/rdifftest.py index 68f88a2..223e7a1 100644 --- a/rdiff-backup/testing/rdifftest.py +++ b/rdiff-backup/testing/rdifftest.py @@ -1,8 +1,8 @@ import unittest, random - -execfile("commontest.py") -rbexec("selection.py") - +from commontest import * +from log import * +from selection import * +import Globals, Rdiff Log.setverbosity(6) diff --git a/rdiff-backup/testing/regressiontest.py b/rdiff-backup/testing/regressiontest.py index 80a60d0..c8cd59c 100644 --- a/rdiff-backup/testing/regressiontest.py +++ b/rdiff-backup/testing/regressiontest.py @@ -1,7 +1,8 @@ import unittest, os - -execfile("commontest.py") -rbexec("main.py") +from commontest import * +from log import * +from rpath import * +import Globals, SetConnections """Regression tests @@ -50,7 +51,7 @@ class PathSetter(unittest.TestCase): """Return (prefix, connection) tuple""" if path: return (return_path, - SetConnections.init_connection("python ./chdir-wrapper "+path)) + SetConnections.init_connection("./chdir-wrapper "+path)) else: return ('./', Globals.local_connection) def get_src_rp(self, path): @@ -193,25 +194,25 @@ class IncrementTest2(PathSetter): Time.setcurtime() SaveState.init_filenames() - _get_main().backup_init_select(Local.inc1rp, Local.rpout) + Main.backup_init_select(Local.inc1rp, Local.rpout) HighLevel.Mirror(self.inc1rp, self.rpout) assert CompareRecursive(Local.inc1rp, Local.rpout) Time.setcurtime() Time.setprevtime(999500000) - _get_main().backup_init_select(self.inc2rp, self.rpout) + Main.backup_init_select(self.inc2rp, self.rpout) HighLevel.Mirror_and_increment(self.inc2rp, self.rpout, self.rpout_inc) assert CompareRecursive(Local.inc2rp, Local.rpout) Time.setcurtime() Time.setprevtime(999510000) - _get_main().backup_init_select(self.inc3rp, self.rpout) + Main.backup_init_select(self.inc3rp, self.rpout) HighLevel.Mirror_and_increment(self.inc3rp, self.rpout, self.rpout_inc) assert CompareRecursive(Local.inc3rp, Local.rpout) Time.setcurtime() Time.setprevtime(999520000) - _get_main().backup_init_select(self.inc4rp, self.rpout) + Main.backup_init_select(self.inc4rp, self.rpout) HighLevel.Mirror_and_increment(self.inc4rp, self.rpout, self.rpout_inc) assert CompareRecursive(Local.inc4rp, Local.rpout) @@ -419,8 +420,8 @@ class MirrorTest(PathSetter): def Mirror(self, rpin, rpout, write_increments = 1): """Like HighLevel.Mirror, but run misc_setup first""" - _get_main().misc_setup([rpin, rpout]) - _get_main().backup_init_select(rpin, rpout) + Main.misc_setup([rpin, rpout]) + Main.backup_init_select(rpin, rpout) if write_increments: HighLevel.Mirror(rpin, rpout, rpout.append_path("rdiff-backup-data/increments")) diff --git a/rdiff-backup/testing/restoretest.py b/rdiff-backup/testing/restoretest.py index e934c4a..a5d7f12 100644 --- a/rdiff-backup/testing/restoretest.py +++ b/rdiff-backup/testing/restoretest.py @@ -1,7 +1,9 @@ import unittest +from commontest import * +from log import * +from restore import * +import Globals -execfile("commontest.py") -rbexec("main.py") Log.setverbosity(3) diff --git a/rdiff-backup/testing/robusttest.py b/rdiff-backup/testing/robusttest.py index 912117a..c76054e 100644 --- a/rdiff-backup/testing/robusttest.py +++ b/rdiff-backup/testing/robusttest.py @@ -1,7 +1,8 @@ import os, unittest +from commontest import * +from rpath import * +from robust import * -execfile("commontest.py") -rbexec("setconnections.py") class TestRobustAction(unittest.TestCase): """Test some robust actions""" diff --git a/rdiff-backup/testing/roottest.py b/rdiff-backup/testing/roottest.py index c6d81c6..2320f4c 100644 --- a/rdiff-backup/testing/roottest.py +++ b/rdiff-backup/testing/roottest.py @@ -1,6 +1,7 @@ import unittest, os -execfile("commontest.py") -rbexec("main.py") +from commontest import * +from log import * +import Globals """Root tests diff --git a/rdiff-backup/testing/rorpitertest.py b/rdiff-backup/testing/rorpitertest.py index 718f75a..6f9cfeb 100644 --- a/rdiff-backup/testing/rorpitertest.py +++ b/rdiff-backup/testing/rorpitertest.py @@ -1,6 +1,9 @@ import unittest -execfile("commontest.py") -rbexec("highlevel.py") +from commontest import * +from log import * +from rpath import * +from rorpiter import * +import Globals #Log.setverbosity(8) diff --git a/rdiff-backup/testing/rpathtest.py b/rdiff-backup/testing/rpathtest.py index 9a24e6c..d4ffdbe 100644 --- a/rdiff-backup/testing/rpathtest.py +++ b/rdiff-backup/testing/rpathtest.py @@ -1,7 +1,6 @@ import os, cPickle, sys, unittest -execfile("commontest.py") -rbexec("highlevel.py") - +from commontest import * +from rpath import * class RPathTest(unittest.TestCase): diff --git a/rdiff-backup/testing/selectiontest.py b/rdiff-backup/testing/selectiontest.py index a80830b..945d427 100644 --- a/rdiff-backup/testing/selectiontest.py +++ b/rdiff-backup/testing/selectiontest.py @@ -1,7 +1,10 @@ from __future__ import generators import re, StringIO, unittest -execfile("commontest.py") -rbexec("highlevel.py") +from commontest import * +from selection import * +from destructive_stepping import * +import Globals + class MatchingTest(unittest.TestCase): """Test matching of file names against various selection functions""" diff --git a/rdiff-backup/testing/server.py b/rdiff-backup/testing/server.py index 5baaca2..da7d905 100755 --- a/rdiff-backup/testing/server.py +++ b/rdiff-backup/testing/server.py @@ -21,12 +21,10 @@ if len(sys.argv) > 2: sys.exit(1) try: - if len(sys.argv) == 2: - olddir = os.getcwd() - os.chdir(sys.argv[1]) - execfile("setconnections.py") - if len(sys.argv) == 2: os.chdir(olddir) -except (OSError, IOError): + if len(sys.argv) == 2: sys.path.insert(0, sys.argv[1]) + import Globals + from connection import * +except (OSError, IOError, ImportError): print_usage() raise diff --git a/rdiff-backup/testing/setconnectionstest.py b/rdiff-backup/testing/setconnectionstest.py index d5d2671..0e862b9 100644 --- a/rdiff-backup/testing/setconnectionstest.py +++ b/rdiff-backup/testing/setconnectionstest.py @@ -1,6 +1,6 @@ import unittest -execfile("commontest.py") -rbexec("setconnections.py") +from commontest import * +import SetConnections class SetConnectionsTest(unittest.TestCase): """Set SetConnections Class""" @@ -18,9 +18,10 @@ class SetConnectionsTest(unittest.TestCase): assert pfd("foobar") == (None, "foobar") assert pfd(r"hello\::there") == (None, "hello\::there") - self.assertRaises(SetConnectionsException, pfd, r"hello\:there::") - self.assertRaises(SetConnectionsException, pfd, "foobar\\") - + self.assertRaises(SetConnections.SetConnectionsException, + pfd, r"hello\:there::") + self.assertRaises(SetConnections.SetConnectionsException, + pfd, "foobar\\") if __name__ == "__main__": unittest.main() diff --git a/rdiff-backup/testing/statictest.py b/rdiff-backup/testing/statictest.py index a9ff812..17518fa 100644 --- a/rdiff-backup/testing/statictest.py +++ b/rdiff-backup/testing/statictest.py @@ -1,6 +1,6 @@ import unittest, types -execfile("commontest.py") -rbexec("static.py") +from commontest import * +from static import * class D: diff --git a/rdiff-backup/testing/statisticstest.py b/rdiff-backup/testing/statisticstest.py index ef714f1..62ad0b7 100644 --- a/rdiff-backup/testing/statisticstest.py +++ b/rdiff-backup/testing/statisticstest.py @@ -1,6 +1,6 @@ import unittest -execfile("commontest.py") -rbexec("statistics.py") +from commontest import * +from statistics import * class StatsObjTest(unittest.TestCase): """Test StatsObj class""" diff --git a/rdiff-backup/testing/timetest.py b/rdiff-backup/testing/timetest.py index d37862e..089ae0c 100644 --- a/rdiff-backup/testing/timetest.py +++ b/rdiff-backup/testing/timetest.py @@ -1,6 +1,6 @@ import unittest -execfile("commontest.py") -rbexec("highlevel.py") +from commontest import * +import Globals, Time class TimeTest(unittest.TestCase): def testConversion(self): @@ -59,7 +59,7 @@ class TimeTest(unittest.TestCase): i2s = Time.intstringtoseconds for s in ["32", "", "d", "231I", "MM", "s", "-2h"]: try: i2s(s) - except TimeException: pass + except Time.TimeException: pass else: assert 0, s assert i2s("7D") == 7*86400 assert i2s("232s") == 232 @@ -104,9 +104,9 @@ class TimeTest(unittest.TestCase): def testGenericStringErrors(self): """Test genstrtotime on some bad strings""" g2t = Time.genstrtotime - self.assertRaises(TimeException, g2t, "hello") - self.assertRaises(TimeException, g2t, "") - self.assertRaises(TimeException, g2t, "3q") + self.assertRaises(Time.TimeException, g2t, "hello") + self.assertRaises(Time.TimeException, g2t, "") + self.assertRaises(Time.TimeException, g2t, "3q") if __name__ == '__main__': unittest.main() |