From bf479909ee9765fa3007360c12fb3b89906645f3 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Fri, 27 Nov 2020 18:54:26 -0500 Subject: Fix tests for GitHub windows platform The tests were failing because of differences in file paths. It was comparing: C:\Users\runneradmin\AppData\... to: C:\Users\RUNNER~1\AppData\... and failing. These changes normalize the file paths so the comparisons work properly. --- tests/test_api.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/test_api.py') 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. -- cgit v1.2.1