Updated tests for new CVS format

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

30 files changed, 71 insertions, 61 deletions

diff --git a/rdiff-backup/CVS-README b/rdiff-backup/CVS-README
index 1a5dab3..ecb0485 100644
--- a/rdiff-backup/CVS-README
+++ b/rdiff-backup/CVS-README
@@ -16,12 +16,21 @@ PYTHONPATH=$RDB_ROOT $RDB_ROOT/rdiff-backup
 Running the unit tests:
 -----------------------
 
-If you want to try some of tests, you first have to untar the
-testfiles.tar.gz as root (the tarball contains device files, files
-with various uid/gid, etc):
+If you want to try some of tests, you first have to get the
+testfiles.tar.gz tarball.  It is available at
+
+http://rdiff-backup.stanford.edu/testfiles.tar.gz
+
+and untar it as root in the testing directory.  Root is required
+because the tarball contains device files, files with various uid/gid,
+etc.  If you don't have root, it's ok, all the tests except for
+roottest.py may still work.
 
 cd testing; tar -xvzf testfiles.tar.gz
 
 Then run the various *test.py files, for instance:
 
 cd testing; python lazytest.py
+
+If python restoretest.py doesn't work, try running ./makerestoretest3.
+
diff --git a/rdiff-backup/misc/myrm b/rdiff-backup/misc/myrm
index ddcf5bb..986bd7a 100755
--- a/rdiff-backup/misc/myrm
+++ b/rdiff-backup/misc/myrm
@@ -1,10 +1,10 @@
 #!/usr/bin/python
 
 import sys, os
-sys.path.insert(0, "../src")
-from rpath import *
-from connection import *
-import Globals
+#sys.path.insert(0, "../src")
+from rdiff_backup.rpath import *
+from rdiff_backup.connection import *
+from rdiff_backup import Globals
 
 lc = Globals.local_connection
 
diff --git a/rdiff-backup/rdiff_backup/filelist.py b/rdiff-backup/rdiff_backup/filelist.py
index 7a660c3..bfce82f 100644
--- a/rdiff-backup/rdiff_backup/filelist.py
+++ b/rdiff-backup/rdiff_backup/filelist.py
@@ -1,5 +1,6 @@
 from __future__ import generators
-execfile("manage.py")
+from manage import *
+from rpath import *
 
 #######################################################################
 #
diff --git a/rdiff-backup/rdiff_backup/rlist.py b/rdiff-backup/rdiff_backup/rlist.py
index c0f8ee9..f27d693 100644
--- a/rdiff-backup/rdiff_backup/rlist.py
+++ b/rdiff-backup/rdiff_backup/rlist.py
@@ -1,6 +1,6 @@
 from __future__ import generators
 import marshal, sha, types
-execfile("iterfile.py")
+from rdiff_backup.iterfile import *
 
 #######################################################################
 #
diff --git a/rdiff-backup/testing/connectiontest.py b/rdiff-backup/testing/connectiontest.py
index ab80256..4c914fb 100644
--- a/rdiff-backup/testing/connectiontest.py
+++ b/rdiff-backup/testing/connectiontest.py
@@ -1,7 +1,7 @@
 import unittest, types, tempfile, os, sys
 from commontest import *
-from connection import *
-import Globals
+from rdiff_backup.connection import *
+from rdiff_backup import Globals
 
 class LocalConnectionTest(unittest.TestCase):
 	"""Test the dummy connection"""
diff --git a/rdiff-backup/testing/ctest.py b/rdiff-backup/testing/ctest.py
index d5f0751..0233ddb 100644
--- a/rdiff-backup/testing/ctest.py
+++ b/rdiff-backup/testing/ctest.py
@@ -1,7 +1,7 @@
 import unittest
 from commontest import *
-from C import *
-from rpath import *
+from rdiff_backup.C import *
+from rdiff_backup.rpath import *
 
 class CTest(unittest.TestCase):
 	"""Test the C module by comparing results to python functions"""
diff --git a/rdiff-backup/testing/destructive_steppingtest.py b/rdiff-backup/testing/destructive_steppingtest.py
index ab1c23b..7e68451 100644
--- a/rdiff-backup/testing/destructive_steppingtest.py
+++ b/rdiff-backup/testing/destructive_steppingtest.py
@@ -1,9 +1,9 @@
 from __future__ import generators
 import unittest
 from commontest import *
-from rpath import *
-from selection import *
-import Globals
+from rdiff_backup.rpath import *
+from rdiff_backup.selection import *
+from rdiff_backup import Globals
 
 Log.setverbosity(4)
 
diff --git a/rdiff-backup/testing/filelisttest.py b/rdiff-backup/testing/filelisttest.py
index f6166ed..6141ba2 100644
--- a/rdiff-backup/testing/filelisttest.py
+++ b/rdiff-backup/testing/filelisttest.py
@@ -1,6 +1,6 @@
 import unittest, StringIO
-execfile("commontest.py")
-rbexec("filelist.py")
+from commontest import *
+from rdiff_backup.filelist import *
 
 
 class FilelistTest(unittest.TestCase):
diff --git a/rdiff-backup/testing/finaltest.py b/rdiff-backup/testing/finaltest.py
index 6cd4885..7e3c1df 100644
--- a/rdiff-backup/testing/finaltest.py
+++ b/rdiff-backup/testing/finaltest.py
@@ -1,8 +1,8 @@
 import unittest, os, re, sys
 from commontest import *
-from log import *
-from rpath import *
-import Globals
+from rdiff_backup.log import *
+from rdiff_backup.rpath import *
+from rdiff_backup import Globals
 
 """Regression tests"""
 
diff --git a/rdiff-backup/testing/hardlinktest.py b/rdiff-backup/testing/hardlinktest.py
index 9e6bdf9..33e43ed 100644
--- a/rdiff-backup/testing/hardlinktest.py
+++ b/rdiff-backup/testing/hardlinktest.py
@@ -1,7 +1,7 @@
 import os, unittest
 from commontest import *
-from rpath import *
-import Globals, Hardlink
+from rdiff_backup.rpath import *
+from rdiff_backup import Globals, Hardlink
 
 Log.setverbosity(7)
 
diff --git a/rdiff-backup/testing/highleveltest.py b/rdiff-backup/testing/highleveltest.py
index c55694b..1054f2b 100644
--- a/rdiff-backup/testing/highleveltest.py
+++ b/rdiff-backup/testing/highleveltest.py
@@ -1,6 +1,6 @@
 import unittest
 from commontest import *
-import Globals, SetConnections
+from rdiff_backup import Globals, SetConnections
 
 class RemoteMirrorTest(unittest.TestCase):
 	"""Test mirroring"""
diff --git a/rdiff-backup/testing/incrementtest.py b/rdiff-backup/testing/incrementtest.py
index 5562fdd..45519e5 100644
--- a/rdiff-backup/testing/incrementtest.py
+++ b/rdiff-backup/testing/incrementtest.py
@@ -1,8 +1,8 @@
 import unittest, os
 from commontest import *
-from log import *
-from rpath import *
-from restore import *
+from rdiff_backup.log import *
+from rdiff_backup.rpath import *
+from rdiff_backup.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 62f622a..2d9fa58 100644
--- a/rdiff-backup/testing/iterfiletest.py
+++ b/rdiff-backup/testing/iterfiletest.py
@@ -1,6 +1,6 @@
 import unittest, StringIO
 from commontest import *
-from iterfile import *
+from rdiff_backup.iterfile import *
 
 
 class testIterFile(unittest.TestCase):
diff --git a/rdiff-backup/testing/killtest.py b/rdiff-backup/testing/killtest.py
index 54c760f..837dfad 100644
--- a/rdiff-backup/testing/killtest.py
+++ b/rdiff-backup/testing/killtest.py
@@ -1,7 +1,7 @@
 import unittest, os, signal, sys, random, time
 from commontest import *
-from log import *
-import Globals, Main
+from rdiff_backup.log import *
+from rdiff_backup 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 d7cd08a..f1949a7 100644
--- a/rdiff-backup/testing/lazytest.py
+++ b/rdiff-backup/testing/lazytest.py
@@ -1,7 +1,7 @@
 from __future__ import generators
 import unittest, pickle
 from commontest import *
-from lazy import *
+from rdiff_backup.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 92ba12e..9de20a3 100644
--- a/rdiff-backup/testing/rdifftest.py
+++ b/rdiff-backup/testing/rdifftest.py
@@ -1,8 +1,8 @@
 import unittest, random
 from commontest import *
-from log import *
-from selection import *
-import Globals, Rdiff
+from rdiff_backup.log import *
+from rdiff_backup.selection import *
+from rdiff_backup import Globals, Rdiff
 
 Log.setverbosity(6)
 
diff --git a/rdiff-backup/testing/regressiontest.py b/rdiff-backup/testing/regressiontest.py
index c8cd59c..a132020 100644
--- a/rdiff-backup/testing/regressiontest.py
+++ b/rdiff-backup/testing/regressiontest.py
@@ -1,8 +1,8 @@
 import unittest, os
 from commontest import *
-from log import *
-from rpath import *
-import Globals, SetConnections
+from rdiff_backup.log import *
+from rdiff_backup.rpath import *
+from rdiff_backup import Globals, SetConnections
 
 
 """Regression tests
diff --git a/rdiff-backup/testing/restoretest.py b/rdiff-backup/testing/restoretest.py
index 922ca91..9d7d9a9 100644
--- a/rdiff-backup/testing/restoretest.py
+++ b/rdiff-backup/testing/restoretest.py
@@ -1,8 +1,8 @@
 import unittest
 from commontest import *
-from log import *
-from restore import *
-import Globals
+from rdiff_backup.log import *
+from rdiff_backup.restore import *
+from rdiff_backup import Globals
 
 Log.setverbosity(3)
 
diff --git a/rdiff-backup/testing/rlisttest.py b/rdiff-backup/testing/rlisttest.py
index 2fe258b..6e40887 100644
--- a/rdiff-backup/testing/rlisttest.py
+++ b/rdiff-backup/testing/rlisttest.py
@@ -1,6 +1,6 @@
 import unittest
-execfile("commontest.py")
-rbexec("rlist.py")
+from commontest import *
+from rdiff_backup.rlist import *
 
 class BasicObject:
 	"""The simplest object that can be used with RList"""
diff --git a/rdiff-backup/testing/robusttest.py b/rdiff-backup/testing/robusttest.py
index c76054e..199f317 100644
--- a/rdiff-backup/testing/robusttest.py
+++ b/rdiff-backup/testing/robusttest.py
@@ -1,7 +1,7 @@
 import os, unittest
 from commontest import *
-from rpath import *
-from robust import *
+from rdiff_backup.rpath import *
+from rdiff_backup.robust import *
 
 
 class TestRobustAction(unittest.TestCase):
diff --git a/rdiff-backup/testing/roottest.py b/rdiff-backup/testing/roottest.py
index 2320f4c..fbeaaa1 100644
--- a/rdiff-backup/testing/roottest.py
+++ b/rdiff-backup/testing/roottest.py
@@ -1,7 +1,7 @@
 import unittest, os
 from commontest import *
-from log import *
-import Globals
+from rdiff_backup.log import *
+from rdiff_backup import Globals
 
 """Root tests
 
diff --git a/rdiff-backup/testing/rorpitertest.py b/rdiff-backup/testing/rorpitertest.py
index 6f9cfeb..e1e0926 100644
--- a/rdiff-backup/testing/rorpitertest.py
+++ b/rdiff-backup/testing/rorpitertest.py
@@ -1,9 +1,9 @@
 import unittest
 from commontest import *
-from log import *
-from rpath import *
-from rorpiter import *
-import Globals
+from rdiff_backup.log import *
+from rdiff_backup.rpath import *
+from rdiff_backup.rorpiter import *
+from rdiff_backup import Globals
 
 
 #Log.setverbosity(8)
diff --git a/rdiff-backup/testing/rpathtest.py b/rdiff-backup/testing/rpathtest.py
index 952abd1..fe19d03 100644
--- a/rdiff-backup/testing/rpathtest.py
+++ b/rdiff-backup/testing/rpathtest.py
@@ -1,6 +1,6 @@
 import os, cPickle, sys, unittest
 from commontest import *
-from rpath import *
+from rdiff_backup.rpath import *
 
 
 class RPathTest(unittest.TestCase):
diff --git a/rdiff-backup/testing/securitytest.py b/rdiff-backup/testing/securitytest.py
index 689544d..7ce12a7 100644
--- a/rdiff-backup/testing/securitytest.py
+++ b/rdiff-backup/testing/securitytest.py
@@ -1,6 +1,6 @@
 import os, unittest
 from commontest import *
-import rdiff_backup.Security, Security
+import rdiff_backup.Security
 
 #Log.setverbosity(5)
 
diff --git a/rdiff-backup/testing/selectiontest.py b/rdiff-backup/testing/selectiontest.py
index 7d998cd..19c3ff8 100644
--- a/rdiff-backup/testing/selectiontest.py
+++ b/rdiff-backup/testing/selectiontest.py
@@ -1,9 +1,9 @@
 from __future__ import generators
 import re, StringIO, unittest
 from commontest import *
-from selection import *
-from destructive_stepping import *
-import Globals
+from rdiff_backup.selection import *
+from rdiff_backup.destructive_stepping import *
+from rdiff_backup import Globals
 
 
 class MatchingTest(unittest.TestCase):
diff --git a/rdiff-backup/testing/server.py b/rdiff-backup/testing/server.py
index da7d905..b5d265d 100755
--- a/rdiff-backup/testing/server.py
+++ b/rdiff-backup/testing/server.py
@@ -22,8 +22,8 @@ if len(sys.argv) > 2:
 
 try:
 	if len(sys.argv) == 2: sys.path.insert(0, sys.argv[1])
-	import Globals
-	from connection import *
+	import rdiff_backup.Globals
+	from rdiff_backup.connection import *
 except (OSError, IOError, ImportError):
 	print_usage()
 	raise
diff --git a/rdiff-backup/testing/setconnectionstest.py b/rdiff-backup/testing/setconnectionstest.py
index 0e862b9..7fa45f1 100644
--- a/rdiff-backup/testing/setconnectionstest.py
+++ b/rdiff-backup/testing/setconnectionstest.py
@@ -1,6 +1,6 @@
 import unittest
 from commontest import *
-import SetConnections
+from rdiff_backup import SetConnections
 
 class SetConnectionsTest(unittest.TestCase):
 	"""Set SetConnections Class"""
diff --git a/rdiff-backup/testing/statictest.py b/rdiff-backup/testing/statictest.py
index 17518fa..ad65511 100644
--- a/rdiff-backup/testing/statictest.py
+++ b/rdiff-backup/testing/statictest.py
@@ -1,6 +1,6 @@
 import unittest, types
 from commontest import *
-from static import *
+from rdiff_backup.static import *
 
 
 class D:
diff --git a/rdiff-backup/testing/statisticstest.py b/rdiff-backup/testing/statisticstest.py
index cc1f675..f7c858a 100644
--- a/rdiff-backup/testing/statisticstest.py
+++ b/rdiff-backup/testing/statisticstest.py
@@ -1,6 +1,6 @@
 import unittest
 from commontest import *
-from statistics import *
+from rdiff_backup.statistics import *
 
 class StatsObjTest(unittest.TestCase):
 	"""Test StatsObj class"""
diff --git a/rdiff-backup/testing/timetest.py b/rdiff-backup/testing/timetest.py
index b6d545f..479a07a 100644
--- a/rdiff-backup/testing/timetest.py
+++ b/rdiff-backup/testing/timetest.py
@@ -1,6 +1,6 @@
 import unittest, time
 from commontest import *
-import Globals, Time
+from rdiff_backup import Globals, Time
 
 class TimeTest(unittest.TestCase):
 	def testConversion(self):