diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conftest.py | 2 | ||||
| -rw-r--r-- | tests/test_api.py | 3 | ||||
| -rw-r--r-- | tests/test_cmdline.py | 2 | ||||
| -rw-r--r-- | tests/test_config.py | 2 | ||||
| -rw-r--r-- | tests/test_coverage.py | 2 | ||||
| -rw-r--r-- | tests/test_data.py | 2 | ||||
| -rw-r--r-- | tests/test_execfile.py | 2 | ||||
| -rw-r--r-- | tests/test_files.py | 4 | ||||
| -rw-r--r-- | tests/test_html.py | 2 | ||||
| -rw-r--r-- | tests/test_misc.py | 3 | ||||
| -rw-r--r-- | tests/test_parser.py | 2 | ||||
| -rw-r--r-- | tests/test_plugins.py | 5 | ||||
| -rw-r--r-- | tests/test_results.py | 2 | ||||
| -rw-r--r-- | tests/test_summary.py | 2 |
14 files changed, 19 insertions, 16 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 5e3ed445..c84f446a 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -14,7 +14,7 @@ import warnings import pytest from coverage import env -from coverage.misc import StopEverything +from coverage.exceptions import StopEverything # Pytest will rewrite assertions in test modules, but not elsewhere. diff --git a/tests/test_api.py b/tests/test_api.py index 05554ae4..d6a9c08a 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -18,8 +18,9 @@ import pytest import coverage from coverage import env from coverage.data import line_counts +from coverage.exceptions import CoverageException from coverage.files import abs_file, relative_filename -from coverage.misc import CoverageException, import_local_file +from coverage.misc import 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_cmdline.py b/tests/test_cmdline.py index ed5090f5..b214473c 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -16,7 +16,7 @@ import coverage.cmdline from coverage import env from coverage.config import CoverageConfig from coverage.data import CoverageData -from coverage.misc import ExceptionDuringRun +from coverage.exceptions import ExceptionDuringRun from coverage.version import __url__ from tests.coveragetest import CoverageTest, OK, ERR, command_line diff --git a/tests/test_config.py b/tests/test_config.py index 83d756a5..a8b0ecef 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -10,7 +10,7 @@ import pytest import coverage from coverage.config import HandyConfigParser -from coverage.misc import CoverageException +from coverage.exceptions import CoverageException from tests.coveragetest import CoverageTest, UsingModulesMixin from tests.helpers import without_module diff --git a/tests/test_coverage.py b/tests/test_coverage.py index 3ddc6e86..1ae927bd 100644 --- a/tests/test_coverage.py +++ b/tests/test_coverage.py @@ -7,7 +7,7 @@ import pytest import coverage from coverage import env -from coverage.misc import CoverageException +from coverage.exceptions import CoverageException from tests.coveragetest import CoverageTest diff --git a/tests/test_data.py b/tests/test_data.py index 867891d4..4b385b7f 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -16,8 +16,8 @@ import pytest from coverage.data import CoverageData, combine_parallel_data from coverage.data import add_data_to_hash, line_counts from coverage.debug import DebugControlString +from coverage.exceptions import CoverageException from coverage.files import PathAliases, canonical_filename -from coverage.misc import CoverageException from tests.coveragetest import CoverageTest from tests.helpers import assert_count_equal diff --git a/tests/test_execfile.py b/tests/test_execfile.py index 7c63ac15..dcd03b44 100644 --- a/tests/test_execfile.py +++ b/tests/test_execfile.py @@ -14,9 +14,9 @@ import sys import pytest from coverage import env +from coverage.exceptions import NoCode, NoSource from coverage.execfile import run_python_file, run_python_module from coverage.files import python_reported_file -from coverage.misc import NoCode, NoSource from tests.coveragetest import CoverageTest, TESTS_DIR, UsingModulesMixin diff --git a/tests/test_files.py b/tests/test_files.py index cfe37460..98ece632 100644 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -8,13 +8,13 @@ import os.path import pytest +from coverage import env from coverage import files +from coverage.exceptions import CoverageException from coverage.files import ( TreeMatcher, FnmatchMatcher, ModuleMatcher, PathAliases, find_python_files, abs_file, actual_path, flat_rootname, fnmatches_to_regex, ) -from coverage.misc import CoverageException -from coverage import env from tests.coveragetest import CoverageTest diff --git a/tests/test_html.py b/tests/test_html.py index 3b3250e4..c9dbacc8 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -16,9 +16,9 @@ import pytest import coverage from coverage import env +from coverage.exceptions import CoverageException, NotPython, NoSource 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 from tests.coveragetest import CoverageTest, TESTS_DIR diff --git a/tests/test_misc.py b/tests/test_misc.py index 760d8efe..95ca977d 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -5,9 +5,10 @@ import pytest +from coverage.exceptions import CoverageException from coverage.misc import contract, dummy_decorator_with_args, file_be_gone from coverage.misc import Hasher, one_of, substitute_variables -from coverage.misc import CoverageException, USE_CONTRACTS +from coverage.misc import USE_CONTRACTS from tests.coveragetest import CoverageTest diff --git a/tests/test_parser.py b/tests/test_parser.py index 46ee25f3..7fd87bba 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -8,7 +8,7 @@ import textwrap import pytest from coverage import env -from coverage.misc import NotPython +from coverage.exceptions import NotPython from coverage.parser import PythonParser from tests.coveragetest import CoverageTest diff --git a/tests/test_plugins.py b/tests/test_plugins.py index 21aeab14..3401895b 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -12,9 +12,10 @@ import pytest import coverage from coverage import env -from coverage.data import line_counts from coverage.control import Plugins -from coverage.misc import CoverageException, import_local_file +from coverage.data import line_counts +from coverage.exceptions import CoverageException +from coverage.misc import import_local_file import coverage.plugin diff --git a/tests/test_results.py b/tests/test_results.py index 0453424b..5811b0c2 100644 --- a/tests/test_results.py +++ b/tests/test_results.py @@ -5,7 +5,7 @@ import pytest -from coverage.misc import CoverageException +from coverage.exceptions import CoverageException from coverage.results import format_lines, Numbers, should_fail_under from tests.coveragetest import CoverageTest diff --git a/tests/test_summary.py b/tests/test_summary.py index a326fc85..a6384c46 100644 --- a/tests/test_summary.py +++ b/tests/test_summary.py @@ -16,7 +16,7 @@ import coverage from coverage import env from coverage.control import Coverage from coverage.data import CoverageData -from coverage.misc import CoverageException +from coverage.exceptions import CoverageException from coverage.summary import SummaryReporter from tests.coveragetest import CoverageTest, TESTS_DIR, UsingModulesMixin |