Commits

Anonymous committed f69c7c1

Fixed tests that failed under windows/py25

  • Participants
  • Parent commits ccae89c

Comments (0)

Files changed (3)

File functional_tests/doc_tests/test_xunit_plugin/test_skips.rst

 AssertionError: bye
 <BLANKLINE>
 ----------------------------------------------------------------------
-XML: .../support/nosetests.xml
+XML: ...nosetests.xml
 ----------------------------------------------------------------------
 Ran 4 tests in ...s
 <BLANKLINE>

File unit_tests/test_config_defaults.rst

     ...                            os.path.join(support, "invalid_value.cfg"),
     ...                            os.path.join(support, "b.cfg")])
     ... # doctest: +ELLIPSIS
-    error: Error reading config file '.../invalid_value.cfg': option 'verbosity': invalid integer value: 'spam'
+    error: Error reading config file '...invalid_value.cfg': option 'verbosity': invalid integer value: 'spam'
 
 
 Invalid config files
 
     >>> options, args = parse([], os.path.join(support, "invalid.cfg"))
     ... # doctest: +ELLIPSIS
-    error: Error reading config file '.../invalid.cfg': File contains no section headers.
-    file: .../invalid.cfg, line: 1
+    error: Error reading config file '...invalid.cfg': File contains no section headers.
+    file: ...invalid.cfg, line: 1
     'spam\n'
 
 (filenames, length == 1)
 
     >>> options, args = parse([], [os.path.join(support, "invalid.cfg")])
     ... # doctest: +ELLIPSIS
-    error: Error reading config file '.../invalid.cfg': File contains no section headers.
-    file: .../invalid.cfg, line: 1
+    error: Error reading config file '...invalid.cfg': File contains no section headers.
+    file: ...invalid.cfg, line: 1
     'spam\n'
 
 (filenames, length > 1)
     ...                            os.path.join(support, "invalid.cfg"),
     ...                            os.path.join(support, "b.cfg")])
     ... # doctest: +ELLIPSIS
-    error: Error reading config file '.../invalid.cfg': File contains no section headers.
-    file: .../invalid.cfg, line: 1
+    error: Error reading config file '...invalid.cfg': File contains no section headers.
+    file: ...invalid.cfg, line: 1
     'spam\n'
 
 

File unit_tests/test_core.py

+import os
 import sys
 import unittest
 from cStringIO import StringIO
             nose.__loader__ = fake_zipimporter()
             usage_txt = nose.core.TestProgram.usage()
             self.assertEqual(usage_txt, '<usage>')
-            self.assertEqual(requested_data, ['nose/usage.txt'])
+            self.assertEqual(requested_data, ['nose%susage.txt' % os.sep])
         finally:
             if existing_loader is not Undefined:
                 nose.__loader__ = existing_loader
             nose.__loader__ = fake_zipimporter()
             usage_txt = nose.core.TestProgram.usage()
             self.assertEqual(usage_txt, '<usage>')
-            self.assertEqual(requested_data, ['PREFIX/nose/usage.txt'])
+            self.assertEqual(requested_data, 
+                             ['PREFIX%snose%susage.txt' % (os.sep, os.sep)])
         finally:
             if existing_loader is not Undefined:
                 nose.__loader__ = existing_loader