summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/test_api.py2
-rw-r--r--tests/test_concurrency.py2
-rw-r--r--tests/test_config.py2
-rw-r--r--tests/test_coverage.py3
-rw-r--r--tests/test_data.py2
-rw-r--r--tests/test_debug.py2
-rw-r--r--tests/test_execfile.py3
-rw-r--r--tests/test_html.py2
-rw-r--r--tests/test_parser.py3
-rw-r--r--tests/test_phystokens.py3
-rw-r--r--tests/test_plugins.py3
-rw-r--r--tests/test_summary.py3
-rw-r--r--tests/test_templite.py3
-rw-r--r--tests/test_xml.py2
14 files changed, 21 insertions, 14 deletions
diff --git a/tests/test_api.py b/tests/test_api.py
index be7cc83e..7d75022e 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -12,6 +12,7 @@ import shutil
import sys
import textwrap
+import pytest
from unittest_mixins import change_dir
import coverage
@@ -22,7 +23,6 @@ from coverage.files import abs_file, relative_filename
from coverage.misc import CoverageException
from tests.coveragetest import CoverageTest, CoverageTestMethodsMixin, TESTS_DIR, UsingModulesMixin
-import pytest
class ApiTest(CoverageTest):
diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
index cc9622d1..fd7aa851 100644
--- a/tests/test_concurrency.py
+++ b/tests/test_concurrency.py
@@ -6,6 +6,7 @@
import glob
import os
import random
+import re
import sys
import threading
import time
@@ -20,7 +21,6 @@ from coverage.files import abs_file
from tests.coveragetest import CoverageTest
from tests.helpers import remove_files
-import re
# These libraries aren't always available, we'll skip tests if they aren't.
diff --git a/tests/test_config.py b/tests/test_config.py
index f1df4d72..3d090668 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -7,13 +7,13 @@
from collections import OrderedDict
import mock
+import pytest
import coverage
from coverage.misc import CoverageException
from tests.coveragetest import CoverageTest, UsingModulesMixin
from tests.helpers import without_module
-import pytest
class ConfigTest(CoverageTest):
diff --git a/tests/test_coverage.py b/tests/test_coverage.py
index 6529aa72..52b405e8 100644
--- a/tests/test_coverage.py
+++ b/tests/test_coverage.py
@@ -4,12 +4,13 @@
"""Tests for coverage.py."""
+import pytest
+
import coverage
from coverage import env
from coverage.misc import CoverageException
from tests.coveragetest import CoverageTest
-import pytest
class TestCoverageTest(CoverageTest):
diff --git a/tests/test_data.py b/tests/test_data.py
index 9eb6ecee..4eda1873 100644
--- a/tests/test_data.py
+++ b/tests/test_data.py
@@ -11,6 +11,7 @@ import sqlite3
import threading
import mock
+import pytest
from coverage.data import CoverageData, combine_parallel_data
from coverage.data import add_data_to_hash, line_counts
@@ -19,7 +20,6 @@ from coverage.files import PathAliases, canonical_filename
from coverage.misc import CoverageException
from tests.coveragetest import CoverageTest
-import pytest
LINES_1 = {
diff --git a/tests/test_debug.py b/tests/test_debug.py
index 629665f9..42d7945e 100644
--- a/tests/test_debug.py
+++ b/tests/test_debug.py
@@ -4,6 +4,7 @@
"""Tests of coverage/debug.py"""
import os
+import re
import pytest
@@ -15,7 +16,6 @@ from coverage.env import C_TRACER
from tests.coveragetest import CoverageTest
from tests.helpers import re_line, re_lines
-import re
class InfoFormatterTest(CoverageTest):
diff --git a/tests/test_execfile.py b/tests/test_execfile.py
index c758f711..77527478 100644
--- a/tests/test_execfile.py
+++ b/tests/test_execfile.py
@@ -11,6 +11,8 @@ import os.path
import re
import sys
+import pytest
+
from coverage import env
from coverage.backward import binary_bytes
from coverage.execfile import run_python_file, run_python_module
@@ -18,7 +20,6 @@ from coverage.files import python_reported_file
from coverage.misc import NoCode, NoSource
from tests.coveragetest import CoverageTest, TESTS_DIR, UsingModulesMixin
-import pytest
TRY_EXECFILE = os.path.join(TESTS_DIR, "modules/process_test/try_execfile.py")
diff --git a/tests/test_html.py b/tests/test_html.py
index a25f76cb..59cda0d4 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -13,6 +13,7 @@ import re
import sys
import mock
+import pytest
from unittest_mixins import change_dir
import coverage
@@ -26,7 +27,6 @@ from coverage.report import get_analysis_to_report
from tests.coveragetest import CoverageTest, TESTS_DIR
from tests.goldtest import gold_path
from tests.goldtest import compare, contains, doesnt_contain, contains_any
-import pytest
class HtmlTestHelpers(CoverageTest):
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 49b23f9b..14950c3d 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -5,13 +5,14 @@
import textwrap
+import pytest
+
from coverage import env
from coverage.misc import NotPython
from coverage.parser import PythonParser
from tests.coveragetest import CoverageTest, xfail
from tests.helpers import arcz_to_arcs
-import pytest
class PythonParserTest(CoverageTest):
diff --git a/tests/test_phystokens.py b/tests/test_phystokens.py
index 5da12d9c..26a72d28 100644
--- a/tests/test_phystokens.py
+++ b/tests/test_phystokens.py
@@ -7,13 +7,14 @@ import os.path
import re
import textwrap
+import pytest
+
from coverage import env
from coverage.phystokens import source_token_lines, source_encoding
from coverage.phystokens import neuter_encoding_declaration, compile_unicode
from coverage.python import get_python_source
from tests.coveragetest import CoverageTest, TESTS_DIR
-import pytest
# A simple program and its token stream.
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index e706ef36..12ce7c1e 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -7,6 +7,8 @@ import inspect
import os.path
from xml.etree import ElementTree
+import pytest
+
import coverage
from coverage import env
from coverage.backward import StringIO, import_local_file
@@ -18,7 +20,6 @@ import coverage.plugin
from tests.coveragetest import CoverageTest
from tests.helpers import CheckUniqueFilenames
-import pytest
class FakeConfig(object):
diff --git a/tests/test_summary.py b/tests/test_summary.py
index f2c75317..1d74af9c 100644
--- a/tests/test_summary.py
+++ b/tests/test_summary.py
@@ -10,6 +10,8 @@ import os.path
import py_compile
import re
+import pytest
+
import coverage
from coverage import env
from coverage.backward import StringIO
@@ -19,7 +21,6 @@ from coverage.misc import CoverageException, output_encoding
from coverage.summary import SummaryReporter
from tests.coveragetest import CoverageTest, TESTS_DIR, UsingModulesMixin
-import pytest
class SummaryTest(UsingModulesMixin, CoverageTest):
diff --git a/tests/test_templite.py b/tests/test_templite.py
index 2879f99d..8d808554 100644
--- a/tests/test_templite.py
+++ b/tests/test_templite.py
@@ -6,10 +6,11 @@
import re
+import pytest
+
from coverage.templite import Templite, TempliteSyntaxError, TempliteValueError
from tests.coveragetest import CoverageTest
-import pytest
# pylint: disable=possibly-unused-variable
diff --git a/tests/test_xml.py b/tests/test_xml.py
index 033c374e..15f07698 100644
--- a/tests/test_xml.py
+++ b/tests/test_xml.py
@@ -9,6 +9,7 @@ import os.path
import re
from xml.etree import ElementTree
+import pytest
from unittest_mixins import change_dir
import coverage
@@ -17,7 +18,6 @@ from coverage.files import abs_file
from tests.coveragetest import CoverageTest
from tests.goldtest import compare, gold_path
-import pytest
class XmlTestHelpers(CoverageTest):
View Lorry Controller Status