diff options
| -rw-r--r-- | tests/test_api.py | 8 | ||||
| -rw-r--r-- | tests/test_files.py | 2 | ||||
| -rw-r--r-- | tests/test_html.py | 4 | ||||
| -rw-r--r-- | tests/test_process.py | 6 |
4 files changed, 11 insertions, 9 deletions
diff --git a/tests/test_api.py b/tests/test_api.py index e2a2a555..3552f8f4 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -18,7 +18,7 @@ import coverage from coverage import env from coverage.backward import code_object, import_local_file, StringIO from coverage.data import line_counts -from coverage.files import abs_file +from coverage.files import abs_file, relative_filename from coverage.misc import CoverageException from tests.coveragetest import CoverageTest, CoverageTestMethodsMixin, TESTS_DIR, UsingModulesMixin @@ -472,8 +472,8 @@ class ApiTest(CoverageTest): # The order of the [paths] setting matters def make_data_file(): data = coverage.CoverageData(".coverage.1") - data.add_lines({os.path.abspath('ci/girder/g1.py'): dict.fromkeys(range(10))}) - data.add_lines({os.path.abspath('ci/girder/plugins/p1.py'): dict.fromkeys(range(10))}) + data.add_lines({abs_file('ci/girder/g1.py'): dict.fromkeys(range(10))}) + data.add_lines({abs_file('ci/girder/plugins/p1.py'): dict.fromkeys(range(10))}) data.write() def get_combined_filenames(): @@ -481,7 +481,7 @@ class ApiTest(CoverageTest): cov.combine() cov.save() data = cov.get_data() - filenames = {os.path.relpath(f).replace("\\", "/") for f in data.measured_files()} + filenames = {relative_filename(f).replace("\\", "/") for f in data.measured_files()} return filenames # Case 1: get the order right. diff --git a/tests/test_files.py b/tests/test_files.py index a84ef61d..9df4e5d0 100644 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -25,7 +25,7 @@ class FilesTest(CoverageTest): def abs_path(self, p): """Return the absolute path for `p`.""" - return os.path.join(os.getcwd(), os.path.normpath(p)) + return os.path.join(abs_file(os.getcwd()), os.path.normpath(p)) def test_simple(self): self.make_file("hello.py") diff --git a/tests/test_html.py b/tests/test_html.py index 12012b6a..85f08204 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -18,7 +18,7 @@ from unittest_mixins import change_dir import coverage from coverage.backward import unicode_class from coverage import env -from coverage.files import flat_rootname +from coverage.files import abs_file, flat_rootname import coverage.html from coverage.misc import CoverageException, NotPython, NoSource from coverage.report import get_analysis_to_report @@ -635,6 +635,8 @@ def compare_html(expected, actual): # The temp dir the tests make. (filepath_to_regex(os.getcwd()), 'TEST_TMPDIR'), (filepath_to_regex(flat_rootname(unicode_class(os.getcwd()))), '_TEST_TMPDIR'), + (filepath_to_regex(abs_file(os.getcwd())), 'TEST_TMPDIR'), + (filepath_to_regex(flat_rootname(unicode_class(abs_file(os.getcwd())))), '_TEST_TMPDIR'), (r'/private/var/folders/[\w/]{35}/coverage_test/tests_test_html_\w+_\d{8}', 'TEST_TMPDIR'), (r'_private_var_folders_\w{35}_coverage_test_tests_test_html_\w+_\d{8}', '_TEST_TMPDIR'), ] diff --git a/tests/test_process.py b/tests/test_process.py index bf0e1ac0..7f772e31 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -20,7 +20,7 @@ import pytest import coverage from coverage import env from coverage.data import line_counts -from coverage.files import python_reported_file +from coverage.files import abs_file, python_reported_file from coverage.misc import output_encoding from tests.coveragetest import CoverageTest, TESTS_DIR, xfail @@ -390,8 +390,8 @@ class ProcessTest(CoverageTest): data.read() summary = line_counts(data, fullpath=True) self.assertEqual(len(summary), 1) - actual = os.path.normcase(os.path.abspath(list(summary.keys())[0])) - expected = os.path.normcase(os.path.abspath('src/x.py')) + actual = abs_file(list(summary.keys())[0]) + expected = abs_file('src/x.py') self.assertEqual(expected, actual) self.assertEqual(list(summary.values())[0], 6) |