Changeset 1440 in tailor

Timestamp:

07/25/07 20:55:53 (6 years ago)

Author:

techtonik@…

Hash name:

20070725185553-138f5-339a0a57fcd950d4dad20276b8c617d5785f1ab6

Message:

test suite windows path correction

Location:

vcpx/tests

Files:

• config.py (modified) (4 diffs)
• tailor.py (modified) (2 diffs)
• fixed_bugs.py (modified) (2 diffs)

vcpx/tests/config.py

@@ -13 +13 @@
     "Test the configuration system"
 
+    TESTDIR = None
+
     def setUp(self):
         from os import mkdir, getcwd
         from os.path import exists, split, join
+        from tempfile import gettempdir
         from atexit import register
         from shutil import rmtree
 
+        self.TESTDIR = join(gettempdir(), 'tailor-tests')
+
         tailor_repo = getcwd()
-        while tailor_repo != '/' and not exists(join(tailor_repo, '_darcs')):
+        while tailor_repo != split(tailor_repo)[0] and not exists(join(tailor_repo, '_darcs')):
             tailor_repo = split(tailor_repo)[0]
         assert exists(join(tailor_repo, '_darcs')), "Tailor Darcs repository not found!"
         self.tailor_repo = tailor_repo
-        if not exists('/tmp/tailor-tests'):
-            mkdir('/tmp/tailor-tests')
-            register(rmtree, '/tmp/tailor-tests')
+        if not exists(self.TESTDIR):
+            mkdir(self.TESTDIR)
+            register(rmtree, self.TESTDIR)
 
     def getTestConfiguration(self, testname):
@@ -47 +52 @@
 
         project1 = Project('project1', config)
-        self.assertEqual(project1.rootdir, '/tmp/tailor-tests')
+        self.assertEqual(project1.rootdir, self.TESTDIR)
         self.assertEqual(project1.source.name, 'svn:project1repo')
         self.assertEqual(project1.target.name, 'darcs:project1')
@@ -113 +118 @@
         """Verify that the state file is computed the way it should"""
 
-        from os.path import expanduser
+        from os.path import expanduser, join
 
         config = Config(self.getTestConfiguration("config-basic_test"),
@@ -119 +124 @@
 
         project1 = Project('project1', config)
-        self.assertEqual(project1.state_file.filename, '/tmp/tailor-tests/project1.state')
+        self.assertEqual(project1.state_file.filename, join(self.TESTDIR, 'project1.state'))
         project3 = Project('project3', config)
-        self.assertEqual(project3.state_file.filename, '/tmp/tailor-tests/_darcs/tailor.state')
+        self.assertEqual(project3.state_file.filename, join(self.TESTDIR, '_darcs', 'tailor.state'))
         project4 = Project('project4', config)
         self.assertEqual(project4.state_file.filename, expanduser('~/tailorize/project4.state'))

vcpx/tests/tailor.py

@@ -323 +323 @@
 class OperationalTest(TestCase):
 
-    TESTDIR = '/tmp/tailor-tests'
+    TESTDIR = None
 
     def setUp(self):
         from os import mkdir, getcwd
         from os.path import exists, split, join
+        from tempfile import gettempdir
         from atexit import register
         from shutil import rmtree
         from vcpx.tests import DEBUG
 
+        self.TESTDIR = join(gettempdir(), 'tailor-tests')
+
         tailor_repo = getcwd()
-        while tailor_repo != '/' and not exists(join(tailor_repo, '_darcs')):
+        while tailor_repo != split(tailor_repo)[0] and not exists(join(tailor_repo, '_darcs')):
             tailor_repo = split(tailor_repo)[0]
         assert exists(join(tailor_repo, '_darcs')), "Tailor Darcs repository not found!"
@@ -426 +429 @@
 
     def testBazaarAndPython23(self):
-        "Test we detect early when running under Python < 2.4"
+        "Bazaar test we detect early when running under Python < 2.4"
 
         from sys import version_info

vcpx/tests/fixed_bugs.py

@@ -19 +19 @@
     """Ensure already fixed bugs don't get reintroduced"""
 
-    TESTDIR = '/tmp/tailor-tests/fixed-bugs'
+    TESTDIR = None
 
     ALL_TARGET_VCS = [ 'arx', 'bzr', 'cdv', 'cg', 'cvs', 'cvsps', 'darcs', 'git', 'hg', 'monotone', 'svn' ]
@@ -42 +42 @@
     def setUp(self):
         from os import makedirs
+        from tempfile import gettempdir
         from shutil import rmtree
         from atexit import register
+
+        self.TESTDIR = join(gettempdir(), 'tailor-tests', 'fixed-bugs')
 
         self.test_name = self.id().split('.')[-1]