fix #222

Author: dnozay

tests/testsuite.py

@@ -13,6 +13,7 @@
 import xmlrunner
 from xmlrunner.result import _DuplicateWriter
 from xmlrunner.result import _XMLTestResult
+from xmlrunner.result import resolve_filename
 import doctest
 import tests.doctest_example
 from io import StringIO, BytesIO
@@ -964,3 +965,23 @@ def test_xmlrunner_output_file(self, exiter, testrunner, opener):
 
         testrunner.assert_called_once_with(**kwargs)
         exiter.assert_called_once_with(False)
+
+
+class ResolveFilenameTestCase(unittest.TestCase):
+    @mock.patch('os.path.relpath')
+    def test_resolve_filename_relative(self, relpath):
+        relpath.return_value = 'somefile.py'
+        filename = resolve_filename('/path/to/somefile.py')
+        self.assertEqual(filename, 'somefile.py')
+
+    @mock.patch('os.path.relpath')
+    def test_resolve_filename_outside(self, relpath):
+        relpath.return_value = '../../../tmp/somefile.py'
+        filename = resolve_filename('/tmp/somefile.py')
+        self.assertEqual(filename, '/tmp/somefile.py')
+
+    @mock.patch('os.path.relpath')
+    def test_resolve_filename_error(self, relpath):
+        relpath.side_effect = ValueError("ValueError: path is on mount 'C:', start on mount 'D:'")
+        filename = resolve_filename('C:\\path\\to\\somefile.py')
+        self.assertEqual(filename, 'C:\\path\\to\\somefile.py')

xmlrunner/result.py

@@ -69,6 +69,16 @@ def testcase_name(test_method):
     return result
 
 
+def resolve_filename(filename):
+    # Try to make filename relative to current directory.
+    try:
+        rel_filename = os.path.relpath(filename)
+    except ValueError:
+        return filename
+    # if not inside folder, keep as-is
+    return filename if rel_filename.startswith('../') else rel_filename
+
+
 class _DuplicateWriter(io.TextIOBase):
     """
     Duplicate output from the first handle to the second handle
@@ -559,8 +569,7 @@ def _report_testcase(test_result, xml_testsuite, xml_document):
 
         if test_result.filename is not None:
             # Try to make filename relative to current directory.
-            filename = os.path.relpath(test_result.filename)
-            filename = test_result.filename if filename.startswith('../') else filename
+            filename = resolve_filename(test_result.filename)
             testcase.setAttribute('file', filename)
 
         if test_result.lineno is not None: