diff options
| -rw-r--r-- | MANIFEST.in | 2 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | doc/contributing.rst | 8 | ||||
| -rw-r--r-- | howto.txt | 2 | ||||
| -rw-r--r-- | igor.py | 14 | ||||
| -rw-r--r-- | metacov.ini | 2 | ||||
| -rw-r--r-- | tests/coveragetest.py | 8 | ||||
| -rw-r--r-- | tests/farm/html/gold_other/blah_blah_other.html | 4 | ||||
| -rw-r--r-- | tests/farm/html/gold_other/index.html | 2 | ||||
| -rw-r--r-- | tests/test_api.py | 2 | ||||
| -rw-r--r-- | tests/test_arcs.py | 2 | ||||
| -rw-r--r-- | tests/test_cmdline.py | 2 | ||||
| -rw-r--r-- | tests/test_codeunit.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_farm.py | 4 | ||||
| -rw-r--r-- | tests/test_files.py | 2 | ||||
| -rw-r--r-- | tests/test_html.py | 2 | ||||
| -rw-r--r-- | tests/test_misc.py | 2 | ||||
| -rw-r--r-- | tests/test_oddball.py | 4 | ||||
| -rw-r--r-- | tests/test_parser.py | 2 | ||||
| -rw-r--r-- | tests/test_phystokens.py | 2 | ||||
| -rw-r--r-- | tests/test_process.py | 6 | ||||
| -rw-r--r-- | tests/test_results.py | 2 | ||||
| -rw-r--r-- | tests/test_summary.py | 26 | ||||
| -rw-r--r-- | tests/test_testing.py | 4 | ||||
| -rw-r--r-- | tests/test_xml.py | 2 | ||||
| -rw-r--r-- | tox.ini | 6 |
30 files changed, 67 insertions, 67 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 0150d90e..d2712d98 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -11,6 +11,6 @@ include requirements.txt include igor.py include tox.ini -recursive-include test * +recursive-include tests * recursive-include doc *.rst global-exclude *.pyc @@ -3,13 +3,13 @@ default: @echo "* No default action *" -TEST_ZIP = test/zipmods.zip -TEST_EGG = test/eggsrc/dist/covtestegg1-0.0.0-py*.egg +TEST_ZIP = tests/zipmods.zip +TEST_EGG = tests/eggsrc/dist/covtestegg1-0.0.0-py*.egg clean: -rm -f *.pyd */*.pyd -rm -f *.so */*.so - PYTHONPATH=. python test/test_farm.py clean + PYTHONPATH=. python tests/test_farm.py clean -rm -rf build coverage.egg-info dist htmlcov -rm -f *.pyc */*.pyc */*/*.pyc */*/*/*.pyc */*/*/*/*.pyc */*/*/*/*/*.pyc -rm -f *.pyo */*.pyo */*/*.pyo */*/*/*.pyo */*/*/*/*.pyo */*/*/*/*/*.pyo @@ -20,14 +20,14 @@ clean: -rm -f MANIFEST -rm -f .coverage .coverage.* coverage.xml -rm -f $(TEST_ZIP) - -rm -rf test/eggsrc/build test/eggsrc/dist test/eggsrc/*.egg-info + -rm -rf tests/eggsrc/build tests/eggsrc/dist tests/eggsrc/*.egg-info -rm -f setuptools-*.egg distribute-*.egg distribute-*.tar.gz -rm -rf doc/_build sterile: clean -rm -rf .tox* -LINTABLE = coverage igor.py setup.py test +LINTABLE = coverage igor.py setup.py tests lint: -pylint --rcfile=.pylintrc $(LINTABLE) @@ -37,7 +37,7 @@ lint: pep8: pep8 --filename=*.py --ignore=E401,E301 --repeat coverage -tests: +test: tox -e py27 $(ARGS) metacov: diff --git a/doc/contributing.rst b/doc/contributing.rst index 90b9ba1b..6c422b55 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -113,9 +113,9 @@ To limit tox to just a few versions of Python, use the ``-e`` switch:: To run just a few tests, you can use nose test selector syntax:: - $ tox test.test_misc:SetupPyTest.test_metadata + $ tox tests.test_misc:SetupPyTest.test_metadata -This looks in `test/test_misc.py` to find the `SetupPyTest` class, and runs the +This looks in `tests/test_misc.py` to find the `SetupPyTest` class, and runs the `test_metadata` test method. Of course, run all the tests on every version of Python you have, before @@ -129,8 +129,8 @@ I try to keep the coverage.py as clean as possible. I use pylint to alert me to possible problems:: $ make lint - pylint --rcfile=.pylintrc coverage setup.py test - python -m tabnanny coverage setup.py test + pylint --rcfile=.pylintrc coverage setup.py tests + python -m tabnanny coverage setup.py tests python igor.py check_eol The source is pylint-clean, even if it's because there are pragmas quieting @@ -91,4 +91,4 @@ - To run the Javascript tests: - open test/js/index.html in variety of browsers. + open tests/js/index.html in variety of browsers. @@ -122,8 +122,8 @@ def do_test_with_tracer(tracer, *noseargs): def do_zip_mods(): """Build the zipmods.zip file.""" - zf = zipfile.ZipFile("test/zipmods.zip", "w") - zf.write("test/covmodzip1.py", "covmodzip1.py") + zf = zipfile.ZipFile("tests/zipmods.zip", "w") + zf.write("tests/covmodzip1.py", "covmodzip1.py") zf.close() def do_install_egg(): @@ -132,7 +132,7 @@ def do_install_egg(): # pylint: disable=F0401,E0611,E1101 import distutils.core cur_dir = os.getcwd() - os.chdir("test/eggsrc") + os.chdir("tests/eggsrc") distutils.core.run_setup("setup.py", ["--quiet", "bdist_egg"]) egg = glob.glob("dist/*.egg")[0] distutils.core.run_setup( @@ -188,10 +188,10 @@ def do_check_eol(): check_files("coverage", ["*.py", "*.c"]) check_files("coverage/htmlfiles", ["*.html", "*.css", "*.js"]) - check_file("test/farm/html/src/bom.py", crlf=False) - check_files("test", ["*.py"]) - check_files("test", ["*,cover"], trail_white=False) - check_files("test/js", ["*.js", "*.html"]) + check_file("tests/farm/html/src/bom.py", crlf=False) + check_files("tests", ["*.py"]) + check_files("tests", ["*,cover"], trail_white=False) + check_files("tests/js", ["*.js", "*.html"]) check_file("setup.py") check_file("igor.py") check_file("Makefile") diff --git a/metacov.ini b/metacov.ini index 384a6b03..75bd9d2d 100644 --- a/metacov.ini +++ b/metacov.ini @@ -5,7 +5,7 @@ data_file = $COVERAGE_HOME/.coverage.meta parallel = true source = $COVERAGE_HOME/coverage - $COVERAGE_HOME/test + $COVERAGE_HOME/tests $COVERAGE_HOME/.tox/py25/lib/python2.5/site-packages/coverage $COVERAGE_HOME/.tox/py26/lib/python2.6/site-packages/coverage $COVERAGE_HOME/.tox/py27/lib/python2.7/site-packages/coverage diff --git a/tests/coveragetest.py b/tests/coveragetest.py index 6f6217aa..5613fa69 100644 --- a/tests/coveragetest.py +++ b/tests/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 test.backtest import run_command -from test.backunittest import TestCase +from tests.backtest import run_command +from tests.backunittest import TestCase class Tee(object): """A file-like that writes to all the file-likes it has.""" @@ -452,8 +452,8 @@ class CoverageTest(TestCase): # Add our test modules directory to PYTHONPATH. I'm sure there's too # much path munging here, but... here = os.path.dirname(self.nice_file(coverage.__file__, "..")) - testmods = self.nice_file(here, 'test/modules') - zipfile = self.nice_file(here, 'test/zipmods.zip') + testmods = self.nice_file(here, 'tests/modules') + zipfile = self.nice_file(here, 'tests/zipmods.zip') pypath = os.getenv('PYTHONPATH', '') if pypath: pypath += os.pathsep diff --git a/tests/farm/html/gold_other/blah_blah_other.html b/tests/farm/html/gold_other/blah_blah_other.html index ab5ae371..a8255d87 100644 --- a/tests/farm/html/gold_other/blah_blah_other.html +++ b/tests/farm/html/gold_other/blah_blah_other.html @@ -5,7 +5,7 @@ <meta http-equiv='X-UA-Compatible' content='IE=emulateIE7' /> - <title>Coverage for /home/ned/coverage/trunk/test/farm/html/othersrc/other: 100%</title> + <title>Coverage for /home/ned/coverage/trunk/tests/farm/html/othersrc/other: 100%</title> <link rel='stylesheet' href='style.css' type='text/css'> <script type='text/javascript' src='jquery-1.4.3.min.js'></script> <script type='text/javascript' src='jquery.hotkeys.js'></script> @@ -19,7 +19,7 @@ <div id='header'> <div class='content'> - <h1>Coverage for <b>/home/ned/coverage/trunk/test/farm/html/othersrc/other</b> : + <h1>Coverage for <b>/home/ned/coverage/trunk/tests/farm/html/othersrc/other</b> : <span class='pc_cov'>100%</span> </h1> <img id='keyboard_icon' src='keybd_closed.png'> diff --git a/tests/farm/html/gold_other/index.html b/tests/farm/html/gold_other/index.html index 7665cfe4..8b47458e 100644 --- a/tests/farm/html/gold_other/index.html +++ b/tests/farm/html/gold_other/index.html @@ -65,7 +65,7 @@ <tbody> <tr class='file'> - <td class='name left'><a href='_home_ned_coverage_trunk_test_farm_html_othersrc_other.html'>/home/ned/coverage/trunk/test/farm/html/othersrc/other</a></td> + <td class='name left'><a href='_home_ned_coverage_trunk_tests_farm_html_othersrc_other.html'>/home/ned/coverage/trunk/tests/farm/html/othersrc/other</a></td> <td>1</td> <td>0</td> <td>0</td> diff --git a/tests/test_api.py b/tests/test_api.py index 559684b8..300a2374 100644 --- a/tests/test_api.py +++ b/tests/test_api.py @@ -5,7 +5,7 @@ import fnmatch, os, re, sys, textwrap import coverage from coverage.backward import StringIO -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class SingletonApiTest(CoverageTest): diff --git a/tests/test_arcs.py b/tests/test_arcs.py index 69c054cc..c66ff022 100644 --- a/tests/test_arcs.py +++ b/tests/test_arcs.py @@ -1,7 +1,7 @@ """Tests for Coverage.py's arc measurement.""" import sys -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class SimpleArcTest(CoverageTest): diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index 33f90212..6b11b3e9 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -6,7 +6,7 @@ import coverage import coverage.cmdline from coverage.misc import ExceptionDuringRun -from test.coveragetest import CoverageTest, OK, ERR +from tests.coveragetest import CoverageTest, OK, ERR class CmdLineTest(CoverageTest): diff --git a/tests/test_codeunit.py b/tests/test_codeunit.py index b4caff88..e4912e11 100644 --- a/tests/test_codeunit.py +++ b/tests/test_codeunit.py @@ -5,7 +5,7 @@ import os, sys from coverage.codeunit import code_unit_factory from coverage.files import FileLocator -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest # pylint: disable=F0401 # Unable to import 'aa' (No module named aa) diff --git a/tests/test_config.py b/tests/test_config.py index 1ca63765..6d370255 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -5,7 +5,7 @@ import sys import coverage from coverage.misc import CoverageException -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class ConfigTest(CoverageTest): diff --git a/tests/test_coverage.py b/tests/test_coverage.py index 0918dfe1..9b421fc7 100644 --- a/tests/test_coverage.py +++ b/tests/test_coverage.py @@ -4,7 +4,7 @@ import sys import coverage from coverage.misc import CoverageException -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class TestCoverageTest(CoverageTest): diff --git a/tests/test_data.py b/tests/test_data.py index 9281ccc7..98156a86 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -4,7 +4,7 @@ from coverage.backward import pickle from coverage.data import CoverageData from coverage.files import PathAliases -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest DATA_1 = { 'a.py': {1:None, 2:None}, 'b.py': {3:None} } diff --git a/tests/test_execfile.py b/tests/test_execfile.py index e7d7041f..7da2854d 100644 --- a/tests/test_execfile.py +++ b/tests/test_execfile.py @@ -5,7 +5,7 @@ import os, sys from coverage.execfile import run_python_file, run_python_module from coverage.misc import NoSource -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest here = os.path.dirname(__file__) diff --git a/tests/test_farm.py b/tests/test_farm.py index f25d6109..e514e663 100644 --- a/tests/test_farm.py +++ b/tests/test_farm.py @@ -3,14 +3,14 @@ import difflib, filecmp, fnmatch, glob, os, re, shutil, sys from nose.plugins.skip import SkipTest -from test.backtest import run_command, execfile # pylint: disable=W0622 +from tests.backtest import run_command, execfile # pylint: disable=W0622 from coverage.control import _TEST_NAME_FILE def test_farm(clean_only=False): """A test-generating function for nose to find and run.""" - for fname in glob.glob("test/farm/*/*.py"): + for fname in glob.glob("tests/farm/*/*.py"): case = FarmTestCase(fname, clean_only) yield (case,) diff --git a/tests/test_files.py b/tests/test_files.py index 051b2743..509c23b1 100644 --- a/tests/test_files.py +++ b/tests/test_files.py @@ -7,7 +7,7 @@ from coverage.files import PathAliases, find_python_files, abs_file from coverage.backward import set # pylint: disable=W0622 from coverage.misc import CoverageException -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class FileLocatorTest(CoverageTest): diff --git a/tests/test_html.py b/tests/test_html.py index 66d1bd7d..40852acc 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -5,7 +5,7 @@ import os.path, re, sys import coverage from coverage.misc import NotPython, NoSource -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class HtmlTestHelpers(CoverageTest): """Methods that help with HTML tests.""" diff --git a/tests/test_misc.py b/tests/test_misc.py index a32030ca..ef4a8774 100644 --- a/tests/test_misc.py +++ b/tests/test_misc.py @@ -2,7 +2,7 @@ from coverage.misc import Hasher, file_be_gone from coverage import __version__, __url__ -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class HasherTest(CoverageTest): """Test our wrapper of md5 hashing.""" diff --git a/tests/test_oddball.py b/tests/test_oddball.py index 113328bb..60fab48f 100644 --- a/tests/test_oddball.py +++ b/tests/test_oddball.py @@ -3,8 +3,8 @@ import os, sys import coverage -from test.coveragetest import CoverageTest -from test import osinfo +from tests.coveragetest import CoverageTest +from tests import osinfo class ThreadingTest(CoverageTest): """Tests of the threading support.""" diff --git a/tests/test_parser.py b/tests/test_parser.py index 6ccef206..80773c74 100644 --- a/tests/test_parser.py +++ b/tests/test_parser.py @@ -1,7 +1,7 @@ """Tests for Coverage.py's code parsing.""" import textwrap -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest from coverage.parser import CodeParser diff --git a/tests/test_phystokens.py b/tests/test_phystokens.py index e4834e4c..6d38a0e5 100644 --- a/tests/test_phystokens.py +++ b/tests/test_phystokens.py @@ -1,7 +1,7 @@ """Tests for Coverage.py's improved tokenizer.""" import os, re -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest from coverage.phystokens import source_token_lines diff --git a/tests/test_process.py b/tests/test_process.py index bf22cc9d..f3d6c56d 100644 --- a/tests/test_process.py +++ b/tests/test_process.py @@ -4,7 +4,7 @@ import glob, os, sys, textwrap from nose.plugins.skip import SkipTest import coverage -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest here = os.path.dirname(__file__) @@ -327,8 +327,8 @@ class ProcessTest(CoverageTest): if sys.version_info >= (2, 6): # Doesn't work in 2.5, and I don't care! def test_coverage_run_dashm_is_like_python_dashm(self): # These -m commands assume the coverage tree is on the path. - out = self.run_command("coverage run -m test.try_execfile") - out2 = self.run_command("python -m test.try_execfile") + out = self.run_command("coverage run -m tests.try_execfile") + out2 = self.run_command("python -m tests.try_execfile") self.assertMultiLineEqual(out, out2) if 0: # Expected failure diff --git a/tests/test_results.py b/tests/test_results.py index 3caa5a66..92c174b6 100644 --- a/tests/test_results.py +++ b/tests/test_results.py @@ -1,7 +1,7 @@ """Tests for Coverage.py's results analysis.""" from coverage.results import Numbers -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class NumbersTest(CoverageTest): diff --git a/tests/test_summary.py b/tests/test_summary.py index 5bb903a6..22021997 100644 --- a/tests/test_summary.py +++ b/tests/test_summary.py @@ -5,7 +5,7 @@ import os, re, sys import coverage from coverage.backward import StringIO -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class SummaryTest(CoverageTest): """Tests of the text summary reporting for coverage.py.""" @@ -44,15 +44,15 @@ class SummaryTest(CoverageTest): # Name Stmts Miss Cover # --------------------------------------------------------------------- - # c:/ned/coverage/trunk/test/modules/covmod1 2 0 100% - # c:/ned/coverage/trunk/test/zipmods.zip/covmodzip1 2 0 100% + # c:/ned/coverage/trunk/tests/modules/covmod1 2 0 100% + # c:/ned/coverage/trunk/tests/zipmods.zip/covmodzip1 2 0 100% # mycode 4 0 100% # --------------------------------------------------------------------- # TOTAL 8 0 100% self.assertNotIn("/coverage/__init__/", report) - self.assertIn("/test/modules/covmod1 ", report) - self.assertIn("/test/zipmods.zip/covmodzip1 ", report) + self.assertIn("/tests/modules/covmod1 ", report) + self.assertIn("/tests/zipmods.zip/covmodzip1 ", report) self.assertIn("mycode ", report) self.assertEqual(self.last_line_squeezed(report), "TOTAL 8 0 100%") @@ -67,8 +67,8 @@ class SummaryTest(CoverageTest): self.assertEqual(self.line_count(report), 3) self.assertNotIn("/coverage/", report) - self.assertNotIn("/test/modules/covmod1 ", report) - self.assertNotIn("/test/zipmods.zip/covmodzip1 ", report) + self.assertNotIn("/tests/modules/covmod1 ", report) + self.assertNotIn("/tests/zipmods.zip/covmodzip1 ", report) self.assertIn("mycode ", report) self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%") @@ -84,8 +84,8 @@ class SummaryTest(CoverageTest): self.assertEqual(self.line_count(report), 3) self.assertNotIn("/coverage/", report) - self.assertNotIn("/test/modules/covmod1 ", report) - self.assertNotIn("/test/zipmods.zip/covmodzip1 ", report) + self.assertNotIn("/tests/modules/covmod1 ", report) + self.assertNotIn("/tests/zipmods.zip/covmodzip1 ", report) self.assertIn("mycode ", report) self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%") @@ -100,8 +100,8 @@ class SummaryTest(CoverageTest): self.assertEqual(self.line_count(report), 3) self.assertNotIn("/coverage/", report) - self.assertNotIn("/test/modules/covmod1 ", report) - self.assertNotIn("/test/zipmods.zip/covmodzip1 ", report) + self.assertNotIn("/tests/modules/covmod1 ", report) + self.assertNotIn("/tests/zipmods.zip/covmodzip1 ", report) self.assertIn("mycode ", report) self.assertEqual(self.last_line_squeezed(report), "mycode 4 0 100%") @@ -259,8 +259,8 @@ class SummaryTest2(CoverageTest): report = repout.getvalue().replace('\\', '/') report = re.sub(r"\s+", " ", report) - self.assertIn("test/modules/pkg1/__init__ 1 0 100%", report) - self.assertIn("test/modules/pkg2/__init__ 0 0 100%", report) + self.assertIn("tests/modules/pkg1/__init__ 1 0 100%", report) + self.assertIn("tests/modules/pkg2/__init__ 0 0 100%", report) class ReportingReturnValue(CoverageTest): diff --git a/tests/test_testing.py b/tests/test_testing.py index c2d1453d..06f2eb01 100644 --- a/tests/test_testing.py +++ b/tests/test_testing.py @@ -3,8 +3,8 @@ import os, sys from coverage.backward import to_bytes, rpartition -from test.backunittest import TestCase -from test.coveragetest import CoverageTest +from tests.backunittest import TestCase +from tests.coveragetest import CoverageTest from coverage.backward import set # pylint: disable=W0622 diff --git a/tests/test_xml.py b/tests/test_xml.py index 204b5869..1659aa0a 100644 --- a/tests/test_xml.py +++ b/tests/test_xml.py @@ -3,7 +3,7 @@ import os, re import coverage -from test.coveragetest import CoverageTest +from tests.coveragetest import CoverageTest class XmlReportTest(CoverageTest): """Tests of the XML reports from coverage.py.""" @@ -10,10 +10,10 @@ envlist = py25, py26, py27, py31, py32, py33, pypy commands = {envpython} setup.py --quiet clean develop - # Create test/zipmods.zip + # Create tests/zipmods.zip # Install the egg1 egg # Remove the C extension so that we can test the PyTracer - {envpython} igor.py zip_mods install_egg remove_extension + {envpython} igor.py zip_mods install_egg remove_extension # Test with the PyTracer {envpython} igor.py test_with_tracer py {posargs} @@ -28,5 +28,5 @@ deps = [testenv:pypy] # PyPy has no C extensions -setenv = +setenv = COVERAGE_NO_EXTENSION=1 |