--- MERGE: merged r4450 to maintenance branch; original log message:

    Removed os.chdir call (setUp method), since that can mess up other tests. Its removal revealed a bug (marked with "!!!").

git-svn-id: http://svn.code.sf.net/p/docutils/code/branches/docutils-0.4@4615 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

1 files changed, 16 insertions, 16 deletions

diff --git a/test/test_dependencies.py b/test/test_dependencies.py
index 46e8ff846..c9d76cd39 100755
--- a/test/test_dependencies.py
+++ b/test/test_dependencies.py
@@ -20,13 +20,10 @@ import docutils.utils
 
 class RecordDependenciesTests(unittest.TestCase):
 
-    def setUp(self):
-        os.chdir(os.path.join(DocutilsTestSupport.testroot, 'data'))
-
-    def get_record(self, inputfile=None, **settings):
-
+    def get_record(self, **settings):
         recordfile = 'record.txt'
-        settings.setdefault('source_path', 'dependencies.txt')
+        settings.setdefault('source_path',
+                            os.path.join('data', 'dependencies.txt'))
         settings.setdefault('settings_overrides', {})
         settings['settings_overrides'] = settings['settings_overrides'].copy()
         settings['settings_overrides']['_disable_config'] = 1
@@ -40,18 +37,21 @@ class RecordDependenciesTests(unittest.TestCase):
 
     def test_dependencies(self):
         self.assertEqual(self.get_record(),
-                         ['include.txt',
-                          'raw.txt'])
+                         [os.path.join('data', 'include.txt'),
+                          os.path.join('data', 'raw.txt')])
         self.assertEqual(self.get_record(writer_name='latex'),
-                         ['include.txt',
-                          'raw.txt',
+                         [os.path.join('data', 'include.txt'),
+                          os.path.join('data', 'raw.txt'),
+                          # !!! should be os.path.join('data', 'some_image.png')
                           'some_image.png'])
 
     def test_csv_dependencies(self):
         try:
             import csv
-            self.assertEqual(self.get_record(source_path='csv_dep.txt'),
-                             ['csv_data.txt'])
+            self.assertEqual(
+                self.get_record(source_path=os.path.join('data',
+                                                         'csv_dep.txt')),
+                ['data/csv_data.txt'])
         except ImportError:
             pass
 
@@ -60,17 +60,17 @@ class RecordDependenciesTests(unittest.TestCase):
         s = {'settings_overrides': {}}
         so = s['settings_overrides']
         so['embed_stylesheet'] = 0
-        so['stylesheet_path'] = 'stylesheet.txt'
+        so['stylesheet_path'] = os.path.join('data', 'stylesheet.txt')
         so['stylesheet'] = None
         s['writer_name'] = 'html'
-        self.assert_('stylesheet.txt' not in
+        self.assert_(os.path.join('data', 'stylesheet.txt') not in
                      self.get_record(**s))
         so['embed_stylesheet'] = 1
-        self.assert_('stylesheet.txt' in
+        self.assert_(os.path.join('data', 'stylesheet.txt') in
                      self.get_record(**s))
         del so['embed_stylesheet']
         s['writer_name'] = 'latex'
-        self.assert_('stylesheet.txt' in
+        self.assert_(os.path.join('data', 'stylesheet.txt') in
                      self.get_record(**s))