Move the test directory to tests to avoid conflicts with the stdlib test package.

--HG--
rename : test/__init__.py => tests/__init__.py
rename : test/backtest.py => tests/backtest.py
rename : test/backunittest.py => tests/backunittest.py
rename : test/coveragetest.py => tests/coveragetest.py
rename : test/covmodzip1.py => tests/covmodzip1.py
rename : test/eggsrc/egg1/__init__.py => tests/eggsrc/egg1/__init__.py
rename : test/eggsrc/egg1/egg1.py => tests/eggsrc/egg1/egg1.py
rename : test/eggsrc/setup.py => tests/eggsrc/setup.py
rename : test/farm/annotate/annotate_dir.py => tests/farm/annotate/annotate_dir.py
rename : test/farm/annotate/gold/white.py,cover => tests/farm/annotate/gold/white.py,cover
rename : test/farm/annotate/gold_anno_dir/a___init__.py,cover => tests/farm/annotate/gold_anno_dir/a___init__.py,cover
rename : test/farm/annotate/gold_anno_dir/a_a.py,cover => tests/farm/annotate/gold_anno_dir/a_a.py,cover
rename : test/farm/annotate/gold_anno_dir/b___init__.py,cover => tests/farm/annotate/gold_anno_dir/b___init__.py,cover
rename : test/farm/annotate/gold_anno_dir/b_b.py,cover => tests/farm/annotate/gold_anno_dir/b_b.py,cover
rename : test/farm/annotate/gold_anno_dir/multi.py,cover => tests/farm/annotate/gold_anno_dir/multi.py,cover
rename : test/farm/annotate/gold_multi/a/__init__.py,cover => tests/farm/annotate/gold_multi/a/__init__.py,cover
rename : test/farm/annotate/gold_multi/a/a.py,cover => tests/farm/annotate/gold_multi/a/a.py,cover
rename : test/farm/annotate/gold_multi/b/__init__.py,cover => tests/farm/annotate/gold_multi/b/__init__.py,cover
rename : test/farm/annotate/gold_multi/b/b.py,cover => tests/farm/annotate/gold_multi/b/b.py,cover
rename : test/farm/annotate/gold_multi/multi.py,cover => tests/farm/annotate/gold_multi/multi.py,cover
rename : test/farm/annotate/gold_v24/white.py,cover => tests/farm/annotate/gold_v24/white.py,cover
rename : test/farm/annotate/run.py => tests/farm/annotate/run.py
rename : test/farm/annotate/run_multi.py => tests/farm/annotate/run_multi.py
rename : test/farm/annotate/src/a/__init__.py => tests/farm/annotate/src/a/__init__.py
rename : test/farm/annotate/src/a/a.py => tests/farm/annotate/src/a/a.py
rename : test/farm/annotate/src/b/__init__.py => tests/farm/annotate/src/b/__init__.py
rename : test/farm/annotate/src/b/b.py => tests/farm/annotate/src/b/b.py
rename : test/farm/annotate/src/multi.py => tests/farm/annotate/src/multi.py
rename : test/farm/annotate/src/white.py => tests/farm/annotate/src/white.py
rename : test/farm/html/gold_a/a.html => tests/farm/html/gold_a/a.html
rename : test/farm/html/gold_a/index.html => tests/farm/html/gold_a/index.html
rename : test/farm/html/gold_b_branch/b.html => tests/farm/html/gold_b_branch/b.html
rename : test/farm/html/gold_b_branch/index.html => tests/farm/html/gold_b_branch/index.html
rename : test/farm/html/gold_bom/bom.html => tests/farm/html/gold_bom/bom.html
rename : test/farm/html/gold_bom/index.html => tests/farm/html/gold_bom/index.html
rename : test/farm/html/gold_isolatin1/index.html => tests/farm/html/gold_isolatin1/index.html
rename : test/farm/html/gold_isolatin1/isolatin1.html => tests/farm/html/gold_isolatin1/isolatin1.html
rename : test/farm/html/gold_omit_1/index.html => tests/farm/html/gold_omit_1/index.html
rename : test/farm/html/gold_omit_1/m1.html => tests/farm/html/gold_omit_1/m1.html
rename : test/farm/html/gold_omit_1/m2.html => tests/farm/html/gold_omit_1/m2.html
rename : test/farm/html/gold_omit_1/m3.html => tests/farm/html/gold_omit_1/m3.html
rename : test/farm/html/gold_omit_1/main.html => tests/farm/html/gold_omit_1/main.html
rename : test/farm/html/gold_omit_2/index.html => tests/farm/html/gold_omit_2/index.html
rename : test/farm/html/gold_omit_2/m2.html => tests/farm/html/gold_omit_2/m2.html
rename : test/farm/html/gold_omit_2/m3.html => tests/farm/html/gold_omit_2/m3.html
rename : test/farm/html/gold_omit_2/main.html => tests/farm/html/gold_omit_2/main.html
rename : test/farm/html/gold_omit_3/index.html => tests/farm/html/gold_omit_3/index.html
rename : test/farm/html/gold_omit_3/m3.html => tests/farm/html/gold_omit_3/m3.html
rename : test/farm/html/gold_omit_3/main.html => tests/farm/html/gold_omit_3/main.html
rename : test/farm/html/gold_omit_4/index.html => tests/farm/html/gold_omit_4/index.html
rename : test/farm/html/gold_omit_4/m1.html => tests/farm/html/gold_omit_4/m1.html
rename : test/farm/html/gold_omit_4/m3.html => tests/farm/html/gold_omit_4/m3.html
rename : test/farm/html/gold_omit_4/main.html => tests/farm/html/gold_omit_4/main.html
rename : test/farm/html/gold_omit_5/index.html => tests/farm/html/gold_omit_5/index.html
rename : test/farm/html/gold_omit_5/m1.html => tests/farm/html/gold_omit_5/m1.html
rename : test/farm/html/gold_omit_5/main.html => tests/farm/html/gold_omit_5/main.html
rename : test/farm/html/gold_other/blah_blah_other.html => tests/farm/html/gold_other/blah_blah_other.html
rename : test/farm/html/gold_other/here.html => tests/farm/html/gold_other/here.html
rename : test/farm/html/gold_other/index.html => tests/farm/html/gold_other/index.html
rename : test/farm/html/gold_partial/index.html => tests/farm/html/gold_partial/index.html
rename : test/farm/html/gold_partial/partial.html => tests/farm/html/gold_partial/partial.html
rename : test/farm/html/gold_styled/a.html => tests/farm/html/gold_styled/a.html
rename : test/farm/html/gold_styled/extra.css => tests/farm/html/gold_styled/extra.css
rename : test/farm/html/gold_styled/index.html => tests/farm/html/gold_styled/index.html
rename : test/farm/html/gold_styled/style.css => tests/farm/html/gold_styled/style.css
rename : test/farm/html/gold_unicode/index.html => tests/farm/html/gold_unicode/index.html
rename : test/farm/html/gold_unicode/unicode.html => tests/farm/html/gold_unicode/unicode.html
rename : test/farm/html/gold_x_xml/coverage.xml => tests/farm/html/gold_x_xml/coverage.xml
rename : test/farm/html/gold_y_xml_branch/coverage.xml => tests/farm/html/gold_y_xml_branch/coverage.xml
rename : test/farm/html/othersrc/other.py => tests/farm/html/othersrc/other.py
rename : test/farm/html/run_a.py => tests/farm/html/run_a.py
rename : test/farm/html/run_a_xml_1.py => tests/farm/html/run_a_xml_1.py
rename : test/farm/html/run_a_xml_2.py => tests/farm/html/run_a_xml_2.py
rename : test/farm/html/run_b_branch.py => tests/farm/html/run_b_branch.py
rename : test/farm/html/run_bom.py => tests/farm/html/run_bom.py
rename : test/farm/html/run_isolatin1.py => tests/farm/html/run_isolatin1.py
rename : test/farm/html/run_omit_1.py => tests/farm/html/run_omit_1.py
rename : test/farm/html/run_omit_2.py => tests/farm/html/run_omit_2.py
rename : test/farm/html/run_omit_3.py => tests/farm/html/run_omit_3.py
rename : test/farm/html/run_omit_4.py => tests/farm/html/run_omit_4.py
rename : test/farm/html/run_omit_5.py => tests/farm/html/run_omit_5.py
rename : test/farm/html/run_other.py => tests/farm/html/run_other.py
rename : test/farm/html/run_partial.py => tests/farm/html/run_partial.py
rename : test/farm/html/run_styled.py => tests/farm/html/run_styled.py
rename : test/farm/html/run_tabbed.py => tests/farm/html/run_tabbed.py
rename : test/farm/html/run_unicode.py => tests/farm/html/run_unicode.py
rename : test/farm/html/run_y_xml_branch.py => tests/farm/html/run_y_xml_branch.py
rename : test/farm/html/src/a.py => tests/farm/html/src/a.py
rename : test/farm/html/src/b.py => tests/farm/html/src/b.py
rename : test/farm/html/src/bom.py => tests/farm/html/src/bom.py
rename : test/farm/html/src/coverage.xml => tests/farm/html/src/coverage.xml
rename : test/farm/html/src/extra.css => tests/farm/html/src/extra.css
rename : test/farm/html/src/here.py => tests/farm/html/src/here.py
rename : test/farm/html/src/isolatin1.py => tests/farm/html/src/isolatin1.py
rename : test/farm/html/src/m1.py => tests/farm/html/src/m1.py
rename : test/farm/html/src/m2.py => tests/farm/html/src/m2.py
rename : test/farm/html/src/m3.py => tests/farm/html/src/m3.py
rename : test/farm/html/src/main.py => tests/farm/html/src/main.py
rename : test/farm/html/src/omit4.ini => tests/farm/html/src/omit4.ini
rename : test/farm/html/src/omit5.ini => tests/farm/html/src/omit5.ini
rename : test/farm/html/src/partial.py => tests/farm/html/src/partial.py
rename : test/farm/html/src/run_a_xml_2.ini => tests/farm/html/src/run_a_xml_2.ini
rename : test/farm/html/src/tabbed.py => tests/farm/html/src/tabbed.py
rename : test/farm/html/src/unicode.py => tests/farm/html/src/unicode.py
rename : test/farm/html/src/y.py => tests/farm/html/src/y.py
rename : test/farm/run/run_chdir.py => tests/farm/run/run_chdir.py
rename : test/farm/run/run_timid.py => tests/farm/run/run_timid.py
rename : test/farm/run/run_xxx.py => tests/farm/run/run_xxx.py
rename : test/farm/run/src/chdir.py => tests/farm/run/src/chdir.py
rename : test/farm/run/src/showtrace.py => tests/farm/run/src/showtrace.py
rename : test/farm/run/src/subdir/placeholder => tests/farm/run/src/subdir/placeholder
rename : test/farm/run/src/xxx => tests/farm/run/src/xxx
rename : test/js/index.html => tests/js/index.html
rename : test/js/tests.js => tests/js/tests.js
rename : test/modules/aa/__init__.py => tests/modules/aa/__init__.py
rename : test/modules/aa/afile.odd.py => tests/modules/aa/afile.odd.py
rename : test/modules/aa/afile.py => tests/modules/aa/afile.py
rename : test/modules/aa/bb.odd/bfile.py => tests/modules/aa/bb.odd/bfile.py
rename : test/modules/aa/bb/__init__.py => tests/modules/aa/bb/__init__.py
rename : test/modules/aa/bb/bfile.odd.py => tests/modules/aa/bb/bfile.odd.py
rename : test/modules/aa/bb/bfile.py => tests/modules/aa/bb/bfile.py
rename : test/modules/aa/bb/cc/__init__.py => tests/modules/aa/bb/cc/__init__.py
rename : test/modules/aa/bb/cc/cfile.py => tests/modules/aa/bb/cc/cfile.py
rename : test/modules/aa/zfile.py => tests/modules/aa/zfile.py
rename : test/modules/covmod1.py => tests/modules/covmod1.py
rename : test/modules/pkg1/__init__.py => tests/modules/pkg1/__init__.py
rename : test/modules/pkg1/__main__.py => tests/modules/pkg1/__main__.py
rename : test/modules/pkg1/p1a.py => tests/modules/pkg1/p1a.py
rename : test/modules/pkg1/p1b.py => tests/modules/pkg1/p1b.py
rename : test/modules/pkg1/p1c.py => tests/modules/pkg1/p1c.py
rename : test/modules/pkg1/runmod2.py => tests/modules/pkg1/runmod2.py
rename : test/modules/pkg1/sub/__init__.py => tests/modules/pkg1/sub/__init__.py
rename : test/modules/pkg1/sub/__main__.py => tests/modules/pkg1/sub/__main__.py
rename : test/modules/pkg1/sub/ps1a.py => tests/modules/pkg1/sub/ps1a.py
rename : test/modules/pkg1/sub/runmod3.py => tests/modules/pkg1/sub/runmod3.py
rename : test/modules/pkg2/__init__.py => tests/modules/pkg2/__init__.py
rename : test/modules/pkg2/p2a.py => tests/modules/pkg2/p2a.py
rename : test/modules/pkg2/p2b.py => tests/modules/pkg2/p2b.py
rename : test/modules/runmod1.py => tests/modules/runmod1.py
rename : test/modules/usepkgs.py => tests/modules/usepkgs.py
rename : test/moremodules/othermods/__init__.py => tests/moremodules/othermods/__init__.py
rename : test/moremodules/othermods/othera.py => tests/moremodules/othermods/othera.py
rename : test/moremodules/othermods/otherb.py => tests/moremodules/othermods/otherb.py
rename : test/moremodules/othermods/sub/__init__.py => tests/moremodules/othermods/sub/__init__.py
rename : test/moremodules/othermods/sub/osa.py => tests/moremodules/othermods/sub/osa.py
rename : test/moremodules/othermods/sub/osb.py => tests/moremodules/othermods/sub/osb.py
rename : test/osinfo.py => tests/osinfo.py
rename : test/qunit/jquery.tmpl.min.js => tests/qunit/jquery.tmpl.min.js
rename : test/qunit/qunit.css => tests/qunit/qunit.css
rename : test/qunit/qunit.js => tests/qunit/qunit.js
rename : test/stress_phystoken.tok => tests/stress_phystoken.tok
rename : test/stress_phystoken_dos.tok => tests/stress_phystoken_dos.tok
rename : test/test_api.py => tests/test_api.py
rename : test/test_arcs.py => tests/test_arcs.py
rename : test/test_cmdline.py => tests/test_cmdline.py
rename : test/test_codeunit.py => tests/test_codeunit.py
rename : test/test_config.py => tests/test_config.py
rename : test/test_coverage.py => tests/test_coverage.py
rename : test/test_data.py => tests/test_data.py
rename : test/test_execfile.py => tests/test_execfile.py
rename : test/test_farm.py => tests/test_farm.py
rename : test/test_files.py => tests/test_files.py
rename : test/test_html.py => tests/test_html.py
rename : test/test_misc.py => tests/test_misc.py
rename : test/test_oddball.py => tests/test_oddball.py
rename : test/test_parser.py => tests/test_parser.py
rename : test/test_phystokens.py => tests/test_phystokens.py
rename : test/test_process.py => tests/test_process.py
rename : test/test_results.py => tests/test_results.py
rename : test/test_summary.py => tests/test_summary.py
rename : test/test_templite.py => tests/test_templite.py
rename : test/test_testing.py => tests/test_testing.py
rename : test/test_xml.py => tests/test_xml.py
rename : test/try_execfile.py => tests/try_execfile.py

1 files changed, 0 insertions, 169 deletions

diff --git a/test/test_files.py b/test/test_files.py
deleted file mode 100644
index 051b2743..00000000
--- a/test/test_files.py
+++ /dev/null
@@ -1,169 +0,0 @@
-"""Tests for files.py"""
-
-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
-
-from test.coveragetest import CoverageTest
-
-
-class FileLocatorTest(CoverageTest):
-    """Tests of `FileLocator`."""
-
-    def abs_path(self, p):
-        """Return the absolute path for `p`."""
-        return os.path.join(os.getcwd(), os.path.normpath(p))
-
-    def test_simple(self):
-        self.make_file("hello.py")
-        fl = FileLocator()
-        self.assertEqual(fl.relative_filename("hello.py"), "hello.py")
-        a = self.abs_path("hello.py")
-        self.assertNotEqual(a, "hello.py")
-        self.assertEqual(fl.relative_filename(a), "hello.py")
-
-    def test_peer_directories(self):
-        self.make_file("sub/proj1/file1.py")
-        self.make_file("sub/proj2/file2.py")
-        a1 = self.abs_path("sub/proj1/file1.py")
-        a2 = self.abs_path("sub/proj2/file2.py")
-        d = os.path.normpath("sub/proj1")
-        os.chdir(d)
-        fl = FileLocator()
-        self.assertEqual(fl.relative_filename(a1), "file1.py")
-        self.assertEqual(fl.relative_filename(a2), a2)
-
-    def test_filepath_contains_absolute_prefix_twice(self):
-        # https://bitbucket.org/ned/coveragepy/issue/194
-        # Build a path that has two pieces matching the absolute path prefix.
-        # Technically, this test doesn't do that on Windows, but drive
-        # letters make that impractical to acheive.
-        fl = FileLocator()
-        d = abs_file(os.curdir)
-        trick = os.path.splitdrive(d)[1].lstrip(os.path.sep)
-        rel = os.path.join('sub', trick, 'file1.py')
-        self.assertEqual(fl.relative_filename(abs_file(rel)), rel)
-
-
-class MatcherTest(CoverageTest):
-    """Tests of file matchers."""
-
-    def test_tree_matcher(self):
-        file1 = self.make_file("sub/file1.py")
-        file2 = self.make_file("sub/file2.c")
-        file3 = self.make_file("sub2/file3.h")
-        file4 = self.make_file("sub3/file4.py")
-        file5 = self.make_file("sub3/file5.c")
-        fl = FileLocator()
-        tm = TreeMatcher([
-            fl.canonical_filename("sub"),
-            fl.canonical_filename(file4),
-            ])
-        self.assertTrue(tm.match(fl.canonical_filename(file1)))
-        self.assertTrue(tm.match(fl.canonical_filename(file2)))
-        self.assertFalse(tm.match(fl.canonical_filename(file3)))
-        self.assertTrue(tm.match(fl.canonical_filename(file4)))
-        self.assertFalse(tm.match(fl.canonical_filename(file5)))
-
-    def test_fnmatch_matcher(self):
-        file1 = self.make_file("sub/file1.py")
-        file2 = self.make_file("sub/file2.c")
-        file3 = self.make_file("sub2/file3.h")
-        file4 = self.make_file("sub3/file4.py")
-        file5 = self.make_file("sub3/file5.c")
-        fl = FileLocator()
-        fnm = FnmatchMatcher(["*.py", "*/sub2/*"])
-        self.assertTrue(fnm.match(fl.canonical_filename(file1)))
-        self.assertFalse(fnm.match(fl.canonical_filename(file2)))
-        self.assertTrue(fnm.match(fl.canonical_filename(file3)))
-        self.assertTrue(fnm.match(fl.canonical_filename(file4)))
-        self.assertFalse(fnm.match(fl.canonical_filename(file5)))
-
-
-class PathAliasesTest(CoverageTest):
-    """Tests for coverage/files.py:PathAliases"""
-
-    def test_noop(self):
-        aliases = PathAliases()
-        self.assertEqual(aliases.map('/ned/home/a.py'), '/ned/home/a.py')
-
-    def test_nomatch(self):
-        aliases = PathAliases()
-        aliases.add('/home/*/src', './mysrc')
-        self.assertEqual(aliases.map('/home/foo/a.py'), '/home/foo/a.py')
-
-    def test_wildcard(self):
-        aliases = PathAliases()
-        aliases.add('/ned/home/*/src', './mysrc')
-        self.assertEqual(aliases.map('/ned/home/foo/src/a.py'), './mysrc/a.py')
-        aliases = PathAliases()
-        aliases.add('/ned/home/*/src/', './mysrc')
-        self.assertEqual(aliases.map('/ned/home/foo/src/a.py'), './mysrc/a.py')
-
-    def test_no_accidental_match(self):
-        aliases = PathAliases()
-        aliases.add('/home/*/src', './mysrc')
-        self.assertEqual(aliases.map('/home/foo/srcetc'), '/home/foo/srcetc')
-
-    def test_multiple_patterns(self):
-        aliases = PathAliases()
-        aliases.add('/home/*/src', './mysrc')
-        aliases.add('/lib/*/libsrc', './mylib')
-        self.assertEqual(aliases.map('/home/foo/src/a.py'), './mysrc/a.py')
-        self.assertEqual(aliases.map('/lib/foo/libsrc/a.py'), './mylib/a.py')
-
-    def test_cant_have_wildcard_at_end(self):
-        aliases = PathAliases()
-        self.assertRaisesRegexp(
-            CoverageException, "Pattern must not end with wildcards.",
-            aliases.add, "/ned/home/*", "fooey"
-            )
-        self.assertRaisesRegexp(
-            CoverageException, "Pattern must not end with wildcards.",
-            aliases.add, "/ned/home/*/", "fooey"
-            )
-        self.assertRaisesRegexp(
-            CoverageException, "Pattern must not end with wildcards.",
-            aliases.add, "/ned/home/*/*/", "fooey"
-            )
-
-    def test_no_accidental_munging(self):
-        aliases = PathAliases()
-        aliases.add(r'c:\Zoo\boo', 'src/')
-        aliases.add('/home/ned$', 'src/')
-        self.assertEqual(aliases.map(r'c:\Zoo\boo\foo.py'), 'src/foo.py')
-        self.assertEqual(aliases.map(r'/home/ned$/foo.py'), 'src/foo.py')
-
-    def test_paths_are_os_corrected(self):
-        aliases = PathAliases()
-        aliases.add('/home/ned/*/src', './mysrc')
-        aliases.add(r'c:\ned\src', './mysrc')
-        mapped = aliases.map(r'C:\Ned\src\sub\a.py')
-        self.assertEqual(mapped, './mysrc/sub/a.py')
-
-        aliases = PathAliases()
-        aliases.add('/home/ned/*/src', r'.\mysrc')
-        aliases.add(r'c:\ned\src', r'.\mysrc')
-        mapped = aliases.map(r'/home/ned/foo/src/sub/a.py')
-        self.assertEqual(mapped, r'.\mysrc\sub\a.py')
-
-
-class FindPythonFilesTest(CoverageTest):
-    """Tests of `find_python_files`."""
-
-    def test_find_python_files(self):
-        self.make_file("sub/a.py")
-        self.make_file("sub/b.py")
-        self.make_file("sub/x.c")                   # nope: not .py
-        self.make_file("sub/ssub/__init__.py")
-        self.make_file("sub/ssub/s.py")
-        self.make_file("sub/ssub/~s.py")            # nope: editor effluvia
-        self.make_file("sub/lab/exp.py")            # nope: no __init__.py
-        py_files = set(find_python_files("sub"))
-        self.assert_same_files(py_files, [
-            "sub/a.py", "sub/b.py",
-            "sub/ssub/__init__.py", "sub/ssub/s.py",
-            ])