diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/coveragetest.py | 2 | ||||
-rw-r--r-- | tests/mixins.py | 6 | ||||
-rw-r--r-- | tests/test_api.py | 3 | ||||
-rw-r--r-- | tests/test_concurrency.py | 2 | ||||
-rw-r--r-- | tests/test_mixins.py | 2 | ||||
-rw-r--r-- | tests/test_oddball.py | 2 | ||||
-rw-r--r-- | tests/test_plugins.py | 3 | ||||
-rw-r--r-- | tests/test_xml.py | 2 |
8 files changed, 9 insertions, 13 deletions
diff --git a/tests/coveragetest.py b/tests/coveragetest.py index 2a55cf8b..1163e349 100644 --- a/tests/coveragetest.py +++ b/tests/coveragetest.py @@ -19,8 +19,8 @@ import pytest import coverage from coverage import env -from coverage.backward import import_local_file from coverage.cmdline import CoverageScript +from coverage.misc import import_local_file from tests.helpers import arcs_to_arcz_repr, arcz_to_arcs, assert_count_equal from tests.helpers import nice_file, run_command diff --git a/tests/mixins.py b/tests/mixins.py index ff47a4da..44b16f6c 100644 --- a/tests/mixins.py +++ b/tests/mixins.py @@ -7,6 +7,7 @@ Test class mixins Some of these are transitional while working toward pure-pytest style. """ +import importlib import os import os.path import shutil @@ -14,8 +15,6 @@ import sys import pytest -from coverage.backward import importlib - from tests.helpers import change_dir, make_file, remove_files @@ -130,8 +129,7 @@ class SysPathModulesMixin: if os.path.exists("__pycache__"): shutil.rmtree("__pycache__") - if importlib and hasattr(importlib, "invalidate_caches"): - importlib.invalidate_caches() + importlib.invalidate_caches() class StdStreamCapturingMixin: diff --git a/tests/test_api.py b/tests/test_api.py index b17f9ee0..57154d64 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -17,10 +17,9 @@ import pytest import coverage from coverage import env -from coverage.backward import import_local_file from coverage.data import line_counts from coverage.files import abs_file, relative_filename -from coverage.misc import CoverageException +from coverage.misc import CoverageException, import_local_file from tests.coveragetest import CoverageTest, TESTS_DIR, UsingModulesMixin from tests.helpers import assert_count_equal, change_dir, nice_file diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py index fa482f91..9cc1f3b6 100644 --- a/tests/test_concurrency.py +++ b/tests/test_concurrency.py @@ -16,9 +16,9 @@ import pytest import coverage from coverage import env -from coverage.backward import import_local_file from coverage.data import line_counts from coverage.files import abs_file +from coverage.misc import import_local_file from tests.coveragetest import CoverageTest from tests.helpers import remove_files diff --git a/tests/test_mixins.py b/tests/test_mixins.py index 028a19fd..aab1242a 100644 --- a/tests/test_mixins.py +++ b/tests/test_mixins.py @@ -6,7 +6,7 @@ import pytest -from coverage.backward import import_local_file +from coverage.misc import import_local_file from tests.mixins import TempDirMixin, SysPathModulesMixin diff --git a/tests/test_oddball.py b/tests/test_oddball.py index a63719ea..2e438396 100644 --- a/tests/test_oddball.py +++ b/tests/test_oddball.py @@ -11,8 +11,8 @@ import pytest import coverage from coverage import env -from coverage.backward import import_local_file from coverage.files import abs_file +from coverage.misc import import_local_file from tests.coveragetest import CoverageTest from tests import osinfo diff --git a/tests/test_plugins.py b/tests/test_plugins.py index 5a8d92ee..fec92749 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -12,10 +12,9 @@ import pytest import coverage from coverage import env -from coverage.backward import import_local_file from coverage.data import line_counts from coverage.control import Plugins -from coverage.misc import CoverageException +from coverage.misc import CoverageException, import_local_file import coverage.plugin diff --git a/tests/test_xml.py b/tests/test_xml.py index 94669cdc..334abb4c 100644 --- a/tests/test_xml.py +++ b/tests/test_xml.py @@ -12,8 +12,8 @@ from xml.etree import ElementTree import pytest import coverage -from coverage.backward import import_local_file from coverage.files import abs_file +from coverage.misc import import_local_file from tests.coveragetest import CoverageTest from tests.goldtest import compare, gold_path |