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

21 files changed, 0 insertions, 158 deletions

diff --git a/test/farm/annotate/annotate_dir.py b/test/farm/annotate/annotate_dir.py
deleted file mode 100644
index 3e37f9ed..00000000
--- a/test/farm/annotate/annotate_dir.py
+++ /dev/null
@@ -1,7 +0,0 @@
-copy("src", "run")
-run("""
-    coverage -e -x multi.py
-    coverage -a -d out_anno_dir
-    """, rundir="run")
-compare("run/out_anno_dir", "gold_anno_dir", "*,cover", left_extra=True)
-clean("run")
diff --git a/test/farm/annotate/gold/white.py,cover b/test/farm/annotate/gold/white.py,cover
deleted file mode 100644
index 36b0b993..00000000
--- a/test/farm/annotate/gold/white.py,cover
+++ /dev/null
@@ -1,33 +0,0 @@
-  # A test case sent to me by Steve White
-  
-> def f(self):
-!     if self==1:
-!         pass
-!     elif self.m('fred'):
-!         pass
-!     elif (g==1) and (b==2):
-!         pass
-!     elif self.m('fred')==True:
-!         pass
-!     elif ((g==1) and (b==2))==True:
-!         pass
-!     else:
-!         pass
-  
-> def g(x):
->     if x == 1:
->         a = 1
-!     else:
-!         a = 2
-  
-> g(1)
-  
-> def h(x):
--     if 0:   #pragma: no cover
--         pass
->     if x == 1:
-!         a = 1
->     else:
->         a = 2
-  
-> h(2)
diff --git a/test/farm/annotate/gold_anno_dir/a___init__.py,cover b/test/farm/annotate/gold_anno_dir/a___init__.py,cover
deleted file mode 100644
index e69de29b..00000000
--- a/test/farm/annotate/gold_anno_dir/a___init__.py,cover
+++ /dev/null
diff --git a/test/farm/annotate/gold_anno_dir/a_a.py,cover b/test/farm/annotate/gold_anno_dir/a_a.py,cover
deleted file mode 100644
index d0ff3c0c..00000000
--- a/test/farm/annotate/gold_anno_dir/a_a.py,cover
+++ /dev/null
@@ -1,5 +0,0 @@
-> def a(x):
->     if x == 1:
->         print("x is 1")
-!     else:
-!         print("x is not 1")
diff --git a/test/farm/annotate/gold_anno_dir/b___init__.py,cover b/test/farm/annotate/gold_anno_dir/b___init__.py,cover
deleted file mode 100644
index e69de29b..00000000
--- a/test/farm/annotate/gold_anno_dir/b___init__.py,cover
+++ /dev/null
diff --git a/test/farm/annotate/gold_anno_dir/b_b.py,cover b/test/farm/annotate/gold_anno_dir/b_b.py,cover
deleted file mode 100644
index 90d076f1..00000000
--- a/test/farm/annotate/gold_anno_dir/b_b.py,cover
+++ /dev/null
@@ -1,3 +0,0 @@
-> def b(x):
->     msg = "x is %s" % x
->     print(msg)
diff --git a/test/farm/annotate/gold_anno_dir/multi.py,cover b/test/farm/annotate/gold_anno_dir/multi.py,cover
deleted file mode 100644
index 2a5c59ce..00000000
--- a/test/farm/annotate/gold_anno_dir/multi.py,cover
+++ /dev/null
@@ -1,5 +0,0 @@
-> import a.a
-> import b.b
-  
-> a.a.a(1)
-> b.b.b(2)
diff --git a/test/farm/annotate/gold_multi/a/__init__.py,cover b/test/farm/annotate/gold_multi/a/__init__.py,cover
deleted file mode 100644
index e69de29b..00000000
--- a/test/farm/annotate/gold_multi/a/__init__.py,cover
+++ /dev/null
diff --git a/test/farm/annotate/gold_multi/a/a.py,cover b/test/farm/annotate/gold_multi/a/a.py,cover
deleted file mode 100644
index fb3f5435..00000000
--- a/test/farm/annotate/gold_multi/a/a.py,cover
+++ /dev/null
@@ -1,5 +0,0 @@
-> def a(x):
->     if x == 1:
->         print "x is 1"
-!     else:
-!         print "x is not 1"
diff --git a/test/farm/annotate/gold_multi/b/__init__.py,cover b/test/farm/annotate/gold_multi/b/__init__.py,cover
deleted file mode 100644
index e69de29b..00000000
--- a/test/farm/annotate/gold_multi/b/__init__.py,cover
+++ /dev/null
diff --git a/test/farm/annotate/gold_multi/b/b.py,cover b/test/farm/annotate/gold_multi/b/b.py,cover
deleted file mode 100644
index a3f5daec..00000000
--- a/test/farm/annotate/gold_multi/b/b.py,cover
+++ /dev/null
@@ -1,2 +0,0 @@
-> def b(x):
->     print "x is %s" % x
diff --git a/test/farm/annotate/gold_multi/multi.py,cover b/test/farm/annotate/gold_multi/multi.py,cover
deleted file mode 100644
index 2a5c59ce..00000000
--- a/test/farm/annotate/gold_multi/multi.py,cover
+++ /dev/null
@@ -1,5 +0,0 @@
-> import a.a
-> import b.b
-  
-> a.a.a(1)
-> b.b.b(2)
diff --git a/test/farm/annotate/gold_v24/white.py,cover b/test/farm/annotate/gold_v24/white.py,cover
deleted file mode 100644
index bbd8d428..00000000
--- a/test/farm/annotate/gold_v24/white.py,cover
+++ /dev/null
@@ -1,33 +0,0 @@
-  # A test case sent to me by Steve White
-  
-> def f(self):
-!     if self==1:
-!         pass
-!     elif self.m('fred'):
-!         pass
-!     elif (g==1) and (b==2):
-!         pass
-!     elif self.m('fred')==True:
-!         pass
-!     elif ((g==1) and (b==2))==True:
-!         pass
->     else:
-!         pass
-  
-> def g(x):
->     if x == 1:
->         a = 1
-!     else:
-!         a = 2
-  
-> g(1)
-  
-> def h(x):
--     if 0:   #pragma: no cover
--         pass
->     if x == 1:
-!         a = 1
->     else:
->         a = 2
-  
-> h(2)
diff --git a/test/farm/annotate/run.py b/test/farm/annotate/run.py
deleted file mode 100644
index c645f21c..00000000
--- a/test/farm/annotate/run.py
+++ /dev/null
@@ -1,7 +0,0 @@
-copy("src", "out")
-run("""
-    coverage -e -x white.py
-    coverage -a white.py
-    """, rundir="out")
-compare("out", "gold", "*,cover")
-clean("out")
diff --git a/test/farm/annotate/run_multi.py b/test/farm/annotate/run_multi.py
deleted file mode 100644
index 4e8252ed..00000000
--- a/test/farm/annotate/run_multi.py
+++ /dev/null
@@ -1,7 +0,0 @@
-copy("src", "out_multi")
-run("""
-    coverage -e -x multi.py
-    coverage -a
-    """, rundir="out_multi")
-compare("out_multi", "gold_multi", "*,cover")
-clean("out_multi")
diff --git a/test/farm/annotate/src/a/__init__.py b/test/farm/annotate/src/a/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/test/farm/annotate/src/a/__init__.py
+++ /dev/null
diff --git a/test/farm/annotate/src/a/a.py b/test/farm/annotate/src/a/a.py
deleted file mode 100644
index c2583d1e..00000000
--- a/test/farm/annotate/src/a/a.py
+++ /dev/null
@@ -1,5 +0,0 @@
-def a(x):
-    if x == 1:
-        print("x is 1")
-    else:
-        print("x is not 1")
diff --git a/test/farm/annotate/src/b/__init__.py b/test/farm/annotate/src/b/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/test/farm/annotate/src/b/__init__.py
+++ /dev/null
diff --git a/test/farm/annotate/src/b/b.py b/test/farm/annotate/src/b/b.py
deleted file mode 100644
index 625a5490..00000000
--- a/test/farm/annotate/src/b/b.py
+++ /dev/null
@@ -1,3 +0,0 @@
-def b(x):
-    msg = "x is %s" % x
-    print(msg)
diff --git a/test/farm/annotate/src/multi.py b/test/farm/annotate/src/multi.py
deleted file mode 100644
index 19a6200c..00000000
--- a/test/farm/annotate/src/multi.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import a.a
-import b.b
-
-a.a.a(1)
-b.b.b(2)
diff --git a/test/farm/annotate/src/white.py b/test/farm/annotate/src/white.py
deleted file mode 100644
index ecbbd25a..00000000
--- a/test/farm/annotate/src/white.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# A test case sent to me by Steve White
-
-def f(self):
-    if self==1:
-        pass
-    elif self.m('fred'):
-        pass
-    elif (g==1) and (b==2):
-        pass
-    elif self.m('fred')==True:
-        pass
-    elif ((g==1) and (b==2))==True:
-        pass
-    else:
-        pass
-
-def g(x):
-    if x == 1:
-        a = 1
-    else:
-        a = 2
-
-g(1)
-
-def h(x):
-    if 0:   #pragma: no cover
-        pass
-    if x == 1:
-        a = 1
-    else:
-        a = 2
-
-h(2)