Get rid of import craziness in the tests.

22 files changed, 35 insertions, 72 deletions

diff --git a/.pylintrc b/.pylintrc
index 54bdd6a8..8ab3d902 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -67,15 +67,12 @@ disable=
 # Messages that may be silly:
 #   R0201: 42:Tracer.stop: Method could be a function
 #   C0321: 80:CodeUnit.__lt__: More than one statement on a single line    
-#   R0401:  1: Cyclic import (coverage -> coverage.control -> coverage.html)
-#   W0403:  4: Relative import 'coveragetest'
 #   E1103: 26:RunTests.test_run_python_file: Instance of 'file' has no 'getvalue' member (but some types could not be inferred)
-    R0201,C0321,R0401,W0403,E1103,
+    R0201,C0321,E1103,
 # Messages that are noisy for now, eventually maybe we'll turn them on:
 #   C0103:256:coverage.morf_filename: Invalid name "f" (should match [a-z_][a-z0-9_]{2,30}$)
 #   W0212: 86:Reporter.report_files: Access to a protected member _analyze of a client class     
-#   W0404: 22:run_tests_with_coverage: Reimport 'coverage' (imported line 18)
-    C0103,W0212,W0404
+    C0103,W0212
 
 [REPORTS]
 
@@ -144,7 +141,7 @@ class-rgx=[A-Z_][a-zA-Z0-9]+$
 function-rgx=[a-z_][a-z0-9_]{2,30}$
 
 # Regular expression which should only match correct method names
-method-rgx=[a-z_][a-z0-9_]{2,30}$
+method-rgx=[a-z_][a-z0-9_]{2,30}$|setUp|tearDown|test_.*
 
 # Regular expression which should only match correct instance attribute names
 attr-rgx=[a-z_][a-z0-9_]{2,30}$
diff --git a/test/coveragetest.py b/test/coveragetest.py
index ced68fc8..6f6217aa 100644
--- a/test/coveragetest.py
+++ b/test/coveragetest.py
@@ -6,8 +6,8 @@ import coverage
 from coverage.backward import sorted, StringIO      # pylint: disable=W0622
 from coverage.backward import to_bytes
 from coverage.control import _TEST_NAME_FILE
-from backtest import run_command
-from backunittest import TestCase
+from test.backtest import run_command
+from test.backunittest import TestCase
 
 class Tee(object):
     """A file-like that writes to all the file-likes it has."""
diff --git a/test/test_api.py b/test/test_api.py
index e83d8b75..1f351b42 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -5,8 +5,7 @@ import fnmatch, os, re, sys, textwrap
 import coverage
 from coverage.backward import StringIO
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 
 class SingletonApiTest(CoverageTest):
diff --git a/test/test_arcs.py b/test/test_arcs.py
index a9f7470b..34d10696 100644
--- a/test/test_arcs.py
+++ b/test/test_arcs.py
@@ -1,9 +1,7 @@
 """Tests for Coverage.py's arc measurement."""
 
-import os, sys
-
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+import sys
+from test.coveragetest import CoverageTest
 
 
 class SimpleArcTest(CoverageTest):
diff --git a/test/test_cmdline.py b/test/test_cmdline.py
index 0fd92de2..33f90212 100644
--- a/test/test_cmdline.py
+++ b/test/test_cmdline.py
@@ -1,13 +1,12 @@
 """Test cmdline.py for coverage."""
 
-import os, pprint, re, shlex, sys, textwrap
+import pprint, re, shlex, sys, textwrap
 import mock
 import coverage
 import coverage.cmdline
 from coverage.misc import ExceptionDuringRun
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest, OK, ERR
+from test.coveragetest import CoverageTest, OK, ERR
 
 
 class CmdLineTest(CoverageTest):
diff --git a/test/test_codeunit.py b/test/test_codeunit.py
index a568fe56..b4caff88 100644
--- a/test/test_codeunit.py
+++ b/test/test_codeunit.py
@@ -5,8 +5,7 @@ import os, sys
 from coverage.codeunit import code_unit_factory
 from coverage.files import FileLocator
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 # pylint: disable=F0401
 # Unable to import 'aa' (No module named aa)
diff --git a/test/test_config.py b/test/test_config.py
index 1fdc2ce2..1ca63765 100644
--- a/test/test_config.py
+++ b/test/test_config.py
@@ -1,12 +1,11 @@
 # -*- coding: utf-8 -*-
 """Test the config file handling for coverage.py"""
 
-import os, sys
+import sys
 import coverage
 from coverage.misc import CoverageException
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 
 class ConfigTest(CoverageTest):
diff --git a/test/test_coverage.py b/test/test_coverage.py
index 5da9cb16..693b6ca0 100644
--- a/test/test_coverage.py
+++ b/test/test_coverage.py
@@ -1,13 +1,10 @@
 """Tests for Coverage."""
 # http://nedbatchelder.com/code/coverage
 
-import os, sys
-
+import sys
 import coverage
 from coverage.misc import CoverageException
-
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 
 class TestCoverageTest(CoverageTest):
diff --git a/test/test_data.py b/test/test_data.py
index 5ad2f440..9281ccc7 100644
--- a/test/test_data.py
+++ b/test/test_data.py
@@ -1,13 +1,10 @@
 """Tests for coverage.data"""
 
-import os, sys
-
 from coverage.backward import pickle
 from coverage.data import CoverageData
 from coverage.files import PathAliases
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 
 DATA_1 = { 'a.py': {1:None, 2:None}, 'b.py': {3:None} }
diff --git a/test/test_execfile.py b/test/test_execfile.py
index 1c5b8024..e7d7041f 100644
--- a/test/test_execfile.py
+++ b/test/test_execfile.py
@@ -5,8 +5,7 @@ import os, sys
 from coverage.execfile import run_python_file, run_python_module
 from coverage.misc import NoSource
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 here = os.path.dirname(__file__)
 
diff --git a/test/test_farm.py b/test/test_farm.py
index c343e2f7..f25d6109 100644
--- a/test/test_farm.py
+++ b/test/test_farm.py
@@ -3,8 +3,7 @@
 import difflib, filecmp, fnmatch, glob, os, re, shutil, sys
 from nose.plugins.skip import SkipTest
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from backtest import run_command, execfile          # pylint: disable=W0622
+from test.backtest import run_command, execfile      # pylint: disable=W0622
 
 from coverage.control import _TEST_NAME_FILE
 
diff --git a/test/test_files.py b/test/test_files.py
index 5692699c..051b2743 100644
--- a/test/test_files.py
+++ b/test/test_files.py
@@ -1,14 +1,13 @@
 """Tests for files.py"""
 
-import os, sys
+import os
 
 from coverage.files import FileLocator, TreeMatcher, FnmatchMatcher
 from coverage.files import PathAliases, find_python_files, abs_file
 from coverage.backward import set                   # pylint: disable=W0622
 from coverage.misc import CoverageException
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 
 class FileLocatorTest(CoverageTest):
diff --git a/test/test_html.py b/test/test_html.py
index 13399e8b..66d1bd7d 100644
--- a/test/test_html.py
+++ b/test/test_html.py
@@ -5,8 +5,7 @@ import os.path, re, sys
 import coverage
 from coverage.misc import NotPython, NoSource
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 class HtmlTestHelpers(CoverageTest):
     """Methods that help with HTML tests."""
diff --git a/test/test_misc.py b/test/test_misc.py
index ac53cddb..a32030ca 100644
--- a/test/test_misc.py
+++ b/test/test_misc.py
@@ -1,11 +1,8 @@
 """Tests of miscellaneous stuff."""
 
-import os, sys
-
 from coverage.misc import Hasher, file_be_gone
 from coverage import __version__, __url__
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 class HasherTest(CoverageTest):
     """Test our wrapper of md5 hashing."""
diff --git a/test/test_oddball.py b/test/test_oddball.py
index 75cd00ee..113328bb 100644
--- a/test/test_oddball.py
+++ b/test/test_oddball.py
@@ -3,9 +3,8 @@
 import os, sys
 import coverage
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
-import osinfo
+from test.coveragetest import CoverageTest
+from test import osinfo
 
 class ThreadingTest(CoverageTest):
     """Tests of the threading support."""
diff --git a/test/test_parser.py b/test/test_parser.py
index 220db17e..6ccef206 100644
--- a/test/test_parser.py
+++ b/test/test_parser.py
@@ -1,10 +1,7 @@
 """Tests for Coverage.py's code parsing."""
 
-import os, sys, textwrap
-
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
-
+import textwrap
+from test.coveragetest import CoverageTest
 from coverage.parser import CodeParser
 
 
diff --git a/test/test_phystokens.py b/test/test_phystokens.py
index d4e417e8..e4834e4c 100644
--- a/test/test_phystokens.py
+++ b/test/test_phystokens.py
@@ -1,10 +1,7 @@
 """Tests for Coverage.py's improved tokenizer."""
 
-import os, re, sys
-
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
-
+import os, re
+from test.coveragetest import CoverageTest
 from coverage.phystokens import source_token_lines
 
 
diff --git a/test/test_process.py b/test/test_process.py
index 26a69b1e..428bb5f1 100644
--- a/test/test_process.py
+++ b/test/test_process.py
@@ -4,8 +4,7 @@ import glob, os, sys, textwrap
 from nose.plugins.skip import SkipTest
 import coverage
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 here = os.path.dirname(__file__)
 
diff --git a/test/test_results.py b/test/test_results.py
index 3da92e4c..3caa5a66 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -1,11 +1,7 @@
 """Tests for Coverage.py's results analysis."""
 
-import os, sys
-
 from coverage.results import Numbers
-
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 
 class NumbersTest(CoverageTest):
diff --git a/test/test_summary.py b/test/test_summary.py
index 0bd40b84..5bb903a6 100644
--- a/test/test_summary.py
+++ b/test/test_summary.py
@@ -5,8 +5,7 @@ import os, re, sys
 import coverage
 from coverage.backward import StringIO
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 class SummaryTest(CoverageTest):
     """Tests of the text summary reporting for coverage.py."""
diff --git a/test/test_testing.py b/test/test_testing.py
index fcbffcde..c2d1453d 100644
--- a/test/test_testing.py
+++ b/test/test_testing.py
@@ -2,10 +2,9 @@
 """Tests that our test infrastructure is really working!"""
 
 import os, sys
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
 from coverage.backward import to_bytes, rpartition
-from backunittest import TestCase
-from coveragetest import CoverageTest
+from test.backunittest import TestCase
+from test.coveragetest import CoverageTest
 
 from coverage.backward import set                   # pylint: disable=W0622
 
diff --git a/test/test_xml.py b/test/test_xml.py
index 2a8bf30d..204b5869 100644
--- a/test/test_xml.py
+++ b/test/test_xml.py
@@ -1,10 +1,9 @@
 """Tests for XML reports from coverage.py."""
 
-import os, re, sys
+import os, re
 import coverage
 
-sys.path.insert(0, os.path.split(__file__)[0]) # Force relative import for Py3k
-from coveragetest import CoverageTest
+from test.coveragetest import CoverageTest
 
 class XmlReportTest(CoverageTest):
     """Tests of the XML reports from coverage.py."""