diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2018-11-18 11:24:07 -0500 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2018-11-18 12:23:05 -0500 |
commit | 740d257d6c6a1bd26900af5115aa9cfa2d3a8b40 (patch) | |
tree | e64144aad8658c504178ded75e98870d11fc2de0 | |
parent | 2fb113e60c2733e640f92d737278431a1f670052 (diff) | |
download | python-coveragepy-git-740d257d6c6a1bd26900af5115aa9cfa2d3a8b40.tar.gz |
Rename farm to gold, since that's what it is
-rw-r--r-- | MANIFEST.in | 2 | ||||
-rw-r--r-- | tests/gold/annotate/anno_dir/a___init__.py,cover (renamed from tests/farm/annotate/gold_anno_dir/a___init__.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/anno_dir/a_a.py,cover (renamed from tests/farm/annotate/gold_anno_dir/a_a.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/anno_dir/b___init__.py,cover (renamed from tests/farm/annotate/gold_anno_dir/b___init__.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/anno_dir/b_b.py,cover (renamed from tests/farm/annotate/gold_anno_dir/b_b.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/anno_dir/multi.py,cover (renamed from tests/farm/annotate/gold_anno_dir/multi.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/annotate/white.py,cover (renamed from tests/farm/annotate/gold/white.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/encodings/utf8.py,cover (renamed from tests/farm/annotate/gold_encodings/utf8.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/multi/a/__init__.py,cover (renamed from tests/farm/annotate/gold_multi/a/__init__.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/multi/a/a.py,cover (renamed from tests/farm/annotate/gold_multi/a/a.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/multi/b/__init__.py,cover (renamed from tests/farm/annotate/gold_multi/b/__init__.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/multi/b/b.py,cover (renamed from tests/farm/annotate/gold_multi/b/b.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/annotate/multi/multi.py,cover (renamed from tests/farm/annotate/gold_multi/multi.py,cover) | 0 | ||||
-rw-r--r-- | tests/gold/html/a/a_py.html (renamed from tests/farm/html/gold_a/a_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/a/index.html (renamed from tests/farm/html/gold_a/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/b_branch/b_py.html (renamed from tests/farm/html/gold_b_branch/b_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/b_branch/index.html (renamed from tests/farm/html/gold_b_branch/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/bom/2/bom_py.html (renamed from tests/farm/html/gold_bom/2/bom_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/bom/2/index.html (renamed from tests/farm/html/gold_bom/2/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/bom/bom_py.html (renamed from tests/farm/html/gold_bom/bom_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/bom/index.html (renamed from tests/farm/html/gold_bom/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/isolatin1/index.html (renamed from tests/farm/html/gold_isolatin1/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/isolatin1/isolatin1_py.html (renamed from tests/farm/html/gold_isolatin1/isolatin1_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_1/index.html (renamed from tests/farm/html/gold_omit_1/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_1/m1_py.html (renamed from tests/farm/html/gold_omit_1/m1_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_1/m2_py.html (renamed from tests/farm/html/gold_omit_1/m2_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_1/m3_py.html (renamed from tests/farm/html/gold_omit_1/m3_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_1/main_py.html (renamed from tests/farm/html/gold_omit_1/main_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_2/index.html (renamed from tests/farm/html/gold_omit_2/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_2/m2_py.html (renamed from tests/farm/html/gold_omit_2/m2_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_2/m3_py.html (renamed from tests/farm/html/gold_omit_2/m3_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_2/main_py.html (renamed from tests/farm/html/gold_omit_2/main_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_3/index.html (renamed from tests/farm/html/gold_omit_3/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_3/m3_py.html (renamed from tests/farm/html/gold_omit_3/m3_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_3/main_py.html (renamed from tests/farm/html/gold_omit_3/main_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_4/index.html (renamed from tests/farm/html/gold_omit_4/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_4/m1_py.html (renamed from tests/farm/html/gold_omit_4/m1_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_4/m3_py.html (renamed from tests/farm/html/gold_omit_4/m3_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_4/main_py.html (renamed from tests/farm/html/gold_omit_4/main_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_5/index.html (renamed from tests/farm/html/gold_omit_5/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_5/m1_py.html (renamed from tests/farm/html/gold_omit_5/m1_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/omit_5/main_py.html (renamed from tests/farm/html/gold_omit_5/main_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/other/blah_blah_other_py.html (renamed from tests/farm/html/gold_other/blah_blah_other_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/other/here_py.html (renamed from tests/farm/html/gold_other/here_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/other/index.html (renamed from tests/farm/html/gold_other/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/partial/index.html (renamed from tests/farm/html/gold_partial/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/partial/partial_py.html (renamed from tests/farm/html/gold_partial/partial_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/styled/a_py.html (renamed from tests/farm/html/gold_styled/a_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/styled/extra.css (renamed from tests/farm/html/gold_styled/extra.css) | 0 | ||||
-rw-r--r-- | tests/gold/html/styled/index.html (renamed from tests/farm/html/gold_styled/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/styled/style.css (renamed from tests/farm/html/gold_styled/style.css) | 0 | ||||
-rw-r--r-- | tests/gold/html/unicode/index.html (renamed from tests/farm/html/gold_unicode/index.html) | 0 | ||||
-rw-r--r-- | tests/gold/html/unicode/unicode_py.html (renamed from tests/farm/html/gold_unicode/unicode_py.html) | 0 | ||||
-rw-r--r-- | tests/gold/xml/x_xml/coverage.xml (renamed from tests/farm/html/gold_x_xml/coverage.xml) | 0 | ||||
-rw-r--r-- | tests/gold/xml/y_xml_branch/coverage.xml (renamed from tests/farm/html/gold_y_xml_branch/coverage.xml) | 0 | ||||
-rw-r--r-- | tests/goldtest.py | 2 | ||||
-rw-r--r-- | tests/test_annotate.py | 8 | ||||
-rw-r--r-- | tests/test_html.py | 28 | ||||
-rw-r--r-- | tests/test_xml.py | 6 |
59 files changed, 23 insertions, 23 deletions
diff --git a/MANIFEST.in b/MANIFEST.in index 195980cb..a06c0562 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -35,7 +35,7 @@ prune doc/_build recursive-include requirements *.pip recursive-include tests *.py *.tok -recursive-include tests/farm */gold*/*.* */gold*/*/*.* +recursive-include tests/gold *.* recursive-include tests js/*.* qunit/*.* prune tests/eggsrc/build diff --git a/tests/farm/annotate/gold_anno_dir/a___init__.py,cover b/tests/gold/annotate/anno_dir/a___init__.py,cover index e69de29b..e69de29b 100644 --- a/tests/farm/annotate/gold_anno_dir/a___init__.py,cover +++ b/tests/gold/annotate/anno_dir/a___init__.py,cover diff --git a/tests/farm/annotate/gold_anno_dir/a_a.py,cover b/tests/gold/annotate/anno_dir/a_a.py,cover index d0ff3c0c..d0ff3c0c 100644 --- a/tests/farm/annotate/gold_anno_dir/a_a.py,cover +++ b/tests/gold/annotate/anno_dir/a_a.py,cover diff --git a/tests/farm/annotate/gold_anno_dir/b___init__.py,cover b/tests/gold/annotate/anno_dir/b___init__.py,cover index e69de29b..e69de29b 100644 --- a/tests/farm/annotate/gold_anno_dir/b___init__.py,cover +++ b/tests/gold/annotate/anno_dir/b___init__.py,cover diff --git a/tests/farm/annotate/gold_anno_dir/b_b.py,cover b/tests/gold/annotate/anno_dir/b_b.py,cover index 90d076f1..90d076f1 100644 --- a/tests/farm/annotate/gold_anno_dir/b_b.py,cover +++ b/tests/gold/annotate/anno_dir/b_b.py,cover diff --git a/tests/farm/annotate/gold_anno_dir/multi.py,cover b/tests/gold/annotate/anno_dir/multi.py,cover index 2a5c59ce..2a5c59ce 100644 --- a/tests/farm/annotate/gold_anno_dir/multi.py,cover +++ b/tests/gold/annotate/anno_dir/multi.py,cover diff --git a/tests/farm/annotate/gold/white.py,cover b/tests/gold/annotate/annotate/white.py,cover index 36b0b993..36b0b993 100644 --- a/tests/farm/annotate/gold/white.py,cover +++ b/tests/gold/annotate/annotate/white.py,cover diff --git a/tests/farm/annotate/gold_encodings/utf8.py,cover b/tests/gold/annotate/encodings/utf8.py,cover index 6dbf7e0d..6dbf7e0d 100644 --- a/tests/farm/annotate/gold_encodings/utf8.py,cover +++ b/tests/gold/annotate/encodings/utf8.py,cover diff --git a/tests/farm/annotate/gold_multi/a/__init__.py,cover b/tests/gold/annotate/multi/a/__init__.py,cover index e69de29b..e69de29b 100644 --- a/tests/farm/annotate/gold_multi/a/__init__.py,cover +++ b/tests/gold/annotate/multi/a/__init__.py,cover diff --git a/tests/farm/annotate/gold_multi/a/a.py,cover b/tests/gold/annotate/multi/a/a.py,cover index fb3f5435..fb3f5435 100644 --- a/tests/farm/annotate/gold_multi/a/a.py,cover +++ b/tests/gold/annotate/multi/a/a.py,cover diff --git a/tests/farm/annotate/gold_multi/b/__init__.py,cover b/tests/gold/annotate/multi/b/__init__.py,cover index e69de29b..e69de29b 100644 --- a/tests/farm/annotate/gold_multi/b/__init__.py,cover +++ b/tests/gold/annotate/multi/b/__init__.py,cover diff --git a/tests/farm/annotate/gold_multi/b/b.py,cover b/tests/gold/annotate/multi/b/b.py,cover index a3f5daec..a3f5daec 100644 --- a/tests/farm/annotate/gold_multi/b/b.py,cover +++ b/tests/gold/annotate/multi/b/b.py,cover diff --git a/tests/farm/annotate/gold_multi/multi.py,cover b/tests/gold/annotate/multi/multi.py,cover index 2a5c59ce..2a5c59ce 100644 --- a/tests/farm/annotate/gold_multi/multi.py,cover +++ b/tests/gold/annotate/multi/multi.py,cover diff --git a/tests/farm/html/gold_a/a_py.html b/tests/gold/html/a/a_py.html index 119ad4a3..119ad4a3 100644 --- a/tests/farm/html/gold_a/a_py.html +++ b/tests/gold/html/a/a_py.html diff --git a/tests/farm/html/gold_a/index.html b/tests/gold/html/a/index.html index b839af1e..b839af1e 100644 --- a/tests/farm/html/gold_a/index.html +++ b/tests/gold/html/a/index.html diff --git a/tests/farm/html/gold_b_branch/b_py.html b/tests/gold/html/b_branch/b_py.html index a21175eb..a21175eb 100644 --- a/tests/farm/html/gold_b_branch/b_py.html +++ b/tests/gold/html/b_branch/b_py.html diff --git a/tests/farm/html/gold_b_branch/index.html b/tests/gold/html/b_branch/index.html index a0346e86..a0346e86 100644 --- a/tests/farm/html/gold_b_branch/index.html +++ b/tests/gold/html/b_branch/index.html diff --git a/tests/farm/html/gold_bom/2/bom_py.html b/tests/gold/html/bom/2/bom_py.html index 14f25413..14f25413 100644 --- a/tests/farm/html/gold_bom/2/bom_py.html +++ b/tests/gold/html/bom/2/bom_py.html diff --git a/tests/farm/html/gold_bom/2/index.html b/tests/gold/html/bom/2/index.html index bde4bb46..bde4bb46 100644 --- a/tests/farm/html/gold_bom/2/index.html +++ b/tests/gold/html/bom/2/index.html diff --git a/tests/farm/html/gold_bom/bom_py.html b/tests/gold/html/bom/bom_py.html index 78d7f7b7..78d7f7b7 100644 --- a/tests/farm/html/gold_bom/bom_py.html +++ b/tests/gold/html/bom/bom_py.html diff --git a/tests/farm/html/gold_bom/index.html b/tests/gold/html/bom/index.html index 4c4d9897..4c4d9897 100644 --- a/tests/farm/html/gold_bom/index.html +++ b/tests/gold/html/bom/index.html diff --git a/tests/farm/html/gold_isolatin1/index.html b/tests/gold/html/isolatin1/index.html index c648ae7d..c648ae7d 100644 --- a/tests/farm/html/gold_isolatin1/index.html +++ b/tests/gold/html/isolatin1/index.html diff --git a/tests/farm/html/gold_isolatin1/isolatin1_py.html b/tests/gold/html/isolatin1/isolatin1_py.html index e8ad244b..e8ad244b 100644 --- a/tests/farm/html/gold_isolatin1/isolatin1_py.html +++ b/tests/gold/html/isolatin1/isolatin1_py.html diff --git a/tests/farm/html/gold_omit_1/index.html b/tests/gold/html/omit_1/index.html index 289c6f10..289c6f10 100644 --- a/tests/farm/html/gold_omit_1/index.html +++ b/tests/gold/html/omit_1/index.html diff --git a/tests/farm/html/gold_omit_1/m1_py.html b/tests/gold/html/omit_1/m1_py.html index 05b2bd49..05b2bd49 100644 --- a/tests/farm/html/gold_omit_1/m1_py.html +++ b/tests/gold/html/omit_1/m1_py.html diff --git a/tests/farm/html/gold_omit_1/m2_py.html b/tests/gold/html/omit_1/m2_py.html index 056e7af1..056e7af1 100644 --- a/tests/farm/html/gold_omit_1/m2_py.html +++ b/tests/gold/html/omit_1/m2_py.html diff --git a/tests/farm/html/gold_omit_1/m3_py.html b/tests/gold/html/omit_1/m3_py.html index 428527b2..428527b2 100644 --- a/tests/farm/html/gold_omit_1/m3_py.html +++ b/tests/gold/html/omit_1/m3_py.html diff --git a/tests/farm/html/gold_omit_1/main_py.html b/tests/gold/html/omit_1/main_py.html index 3fbc4af7..3fbc4af7 100644 --- a/tests/farm/html/gold_omit_1/main_py.html +++ b/tests/gold/html/omit_1/main_py.html diff --git a/tests/farm/html/gold_omit_2/index.html b/tests/gold/html/omit_2/index.html index 5813c0dc..5813c0dc 100644 --- a/tests/farm/html/gold_omit_2/index.html +++ b/tests/gold/html/omit_2/index.html diff --git a/tests/farm/html/gold_omit_2/m2_py.html b/tests/gold/html/omit_2/m2_py.html index 056e7af1..056e7af1 100644 --- a/tests/farm/html/gold_omit_2/m2_py.html +++ b/tests/gold/html/omit_2/m2_py.html diff --git a/tests/farm/html/gold_omit_2/m3_py.html b/tests/gold/html/omit_2/m3_py.html index 428527b2..428527b2 100644 --- a/tests/farm/html/gold_omit_2/m3_py.html +++ b/tests/gold/html/omit_2/m3_py.html diff --git a/tests/farm/html/gold_omit_2/main_py.html b/tests/gold/html/omit_2/main_py.html index 3fbc4af7..3fbc4af7 100644 --- a/tests/farm/html/gold_omit_2/main_py.html +++ b/tests/gold/html/omit_2/main_py.html diff --git a/tests/farm/html/gold_omit_3/index.html b/tests/gold/html/omit_3/index.html index 4ebcf4a4..4ebcf4a4 100644 --- a/tests/farm/html/gold_omit_3/index.html +++ b/tests/gold/html/omit_3/index.html diff --git a/tests/farm/html/gold_omit_3/m3_py.html b/tests/gold/html/omit_3/m3_py.html index 428527b2..428527b2 100644 --- a/tests/farm/html/gold_omit_3/m3_py.html +++ b/tests/gold/html/omit_3/m3_py.html diff --git a/tests/farm/html/gold_omit_3/main_py.html b/tests/gold/html/omit_3/main_py.html index 3fbc4af7..3fbc4af7 100644 --- a/tests/farm/html/gold_omit_3/main_py.html +++ b/tests/gold/html/omit_3/main_py.html diff --git a/tests/farm/html/gold_omit_4/index.html b/tests/gold/html/omit_4/index.html index e7588714..e7588714 100644 --- a/tests/farm/html/gold_omit_4/index.html +++ b/tests/gold/html/omit_4/index.html diff --git a/tests/farm/html/gold_omit_4/m1_py.html b/tests/gold/html/omit_4/m1_py.html index 05b2bd49..05b2bd49 100644 --- a/tests/farm/html/gold_omit_4/m1_py.html +++ b/tests/gold/html/omit_4/m1_py.html diff --git a/tests/farm/html/gold_omit_4/m3_py.html b/tests/gold/html/omit_4/m3_py.html index 428527b2..428527b2 100644 --- a/tests/farm/html/gold_omit_4/m3_py.html +++ b/tests/gold/html/omit_4/m3_py.html diff --git a/tests/farm/html/gold_omit_4/main_py.html b/tests/gold/html/omit_4/main_py.html index 3fbc4af7..3fbc4af7 100644 --- a/tests/farm/html/gold_omit_4/main_py.html +++ b/tests/gold/html/omit_4/main_py.html diff --git a/tests/farm/html/gold_omit_5/index.html b/tests/gold/html/omit_5/index.html index e2c1a132..e2c1a132 100644 --- a/tests/farm/html/gold_omit_5/index.html +++ b/tests/gold/html/omit_5/index.html diff --git a/tests/farm/html/gold_omit_5/m1_py.html b/tests/gold/html/omit_5/m1_py.html index 05b2bd49..05b2bd49 100644 --- a/tests/farm/html/gold_omit_5/m1_py.html +++ b/tests/gold/html/omit_5/m1_py.html diff --git a/tests/farm/html/gold_omit_5/main_py.html b/tests/gold/html/omit_5/main_py.html index 3fbc4af7..3fbc4af7 100644 --- a/tests/farm/html/gold_omit_5/main_py.html +++ b/tests/gold/html/omit_5/main_py.html diff --git a/tests/farm/html/gold_other/blah_blah_other_py.html b/tests/gold/html/other/blah_blah_other_py.html index 36e3653d..36e3653d 100644 --- a/tests/farm/html/gold_other/blah_blah_other_py.html +++ b/tests/gold/html/other/blah_blah_other_py.html diff --git a/tests/farm/html/gold_other/here_py.html b/tests/gold/html/other/here_py.html index 8efa027a..8efa027a 100644 --- a/tests/farm/html/gold_other/here_py.html +++ b/tests/gold/html/other/here_py.html diff --git a/tests/farm/html/gold_other/index.html b/tests/gold/html/other/index.html index 10d4ae9a..10d4ae9a 100644 --- a/tests/farm/html/gold_other/index.html +++ b/tests/gold/html/other/index.html diff --git a/tests/farm/html/gold_partial/index.html b/tests/gold/html/partial/index.html index 6ac43531..6ac43531 100644 --- a/tests/farm/html/gold_partial/index.html +++ b/tests/gold/html/partial/index.html diff --git a/tests/farm/html/gold_partial/partial_py.html b/tests/gold/html/partial/partial_py.html index 96d02f2f..96d02f2f 100644 --- a/tests/farm/html/gold_partial/partial_py.html +++ b/tests/gold/html/partial/partial_py.html diff --git a/tests/farm/html/gold_styled/a_py.html b/tests/gold/html/styled/a_py.html index dd569b1b..dd569b1b 100644 --- a/tests/farm/html/gold_styled/a_py.html +++ b/tests/gold/html/styled/a_py.html diff --git a/tests/farm/html/gold_styled/extra.css b/tests/gold/html/styled/extra.css index 46c41fcd..46c41fcd 100644 --- a/tests/farm/html/gold_styled/extra.css +++ b/tests/gold/html/styled/extra.css diff --git a/tests/farm/html/gold_styled/index.html b/tests/gold/html/styled/index.html index 1f86b772..1f86b772 100644 --- a/tests/farm/html/gold_styled/index.html +++ b/tests/gold/html/styled/index.html diff --git a/tests/farm/html/gold_styled/style.css b/tests/gold/html/styled/style.css index 14592865..14592865 100644 --- a/tests/farm/html/gold_styled/style.css +++ b/tests/gold/html/styled/style.css diff --git a/tests/farm/html/gold_unicode/index.html b/tests/gold/html/unicode/index.html index 35a98a9e..35a98a9e 100644 --- a/tests/farm/html/gold_unicode/index.html +++ b/tests/gold/html/unicode/index.html diff --git a/tests/farm/html/gold_unicode/unicode_py.html b/tests/gold/html/unicode/unicode_py.html index 174a9a27..174a9a27 100644 --- a/tests/farm/html/gold_unicode/unicode_py.html +++ b/tests/gold/html/unicode/unicode_py.html diff --git a/tests/farm/html/gold_x_xml/coverage.xml b/tests/gold/xml/x_xml/coverage.xml index 1030f9f8..1030f9f8 100644 --- a/tests/farm/html/gold_x_xml/coverage.xml +++ b/tests/gold/xml/x_xml/coverage.xml diff --git a/tests/farm/html/gold_y_xml_branch/coverage.xml b/tests/gold/xml/y_xml_branch/coverage.xml index 71e08bb0..71e08bb0 100644 --- a/tests/farm/html/gold_y_xml_branch/coverage.xml +++ b/tests/gold/xml/y_xml_branch/coverage.xml diff --git a/tests/goldtest.py b/tests/goldtest.py index 975db615..4c6c3c96 100644 --- a/tests/goldtest.py +++ b/tests/goldtest.py @@ -20,7 +20,7 @@ from tests.coveragetest import TESTS_DIR def gold_path(path): """Get a path to a gold file for comparison.""" - return os.path.join(TESTS_DIR, "farm", path) + return os.path.join(TESTS_DIR, "gold", path) # "rU" was deprecated in 3.4 diff --git a/tests/test_annotate.py b/tests/test_annotate.py index 5b275f93..65054ffd 100644 --- a/tests/test_annotate.py +++ b/tests/test_annotate.py @@ -41,7 +41,7 @@ class AnnotationGoldTest1(CoverageTest): self.start_import_stop(cov, "multi") cov.annotate() - compare(gold_path("annotate/gold_multi"), ".", "*,cover") + compare(gold_path("annotate/multi"), ".", "*,cover") def test_annotate_dir(self): self.make_multi() @@ -49,7 +49,7 @@ class AnnotationGoldTest1(CoverageTest): self.start_import_stop(cov, "multi") cov.annotate(directory="out_anno_dir") - compare(gold_path("annotate/gold_anno_dir"), "out_anno_dir", "*,cover") + compare(gold_path("annotate/anno_dir"), "out_anno_dir", "*,cover") def test_encoding(self): self.make_file("utf8.py", """\ @@ -61,7 +61,7 @@ class AnnotationGoldTest1(CoverageTest): cov = coverage.Coverage() self.start_import_stop(cov, "utf8") cov.annotate() - compare(gold_path("annotate/gold_encodings"), ".", "*,cover") + compare(gold_path("annotate/encodings"), ".", "*,cover") def test_white(self): self.make_file("white.py", """\ @@ -103,4 +103,4 @@ class AnnotationGoldTest1(CoverageTest): cov = coverage.Coverage() self.start_import_stop(cov, "white") cov.annotate() - compare(gold_path("annotate/gold"), ".", "*,cover") + compare(gold_path("annotate/annotate"), ".", "*,cover") diff --git a/tests/test_html.py b/tests/test_html.py index 0b25e91d..bd6f7bd8 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -622,7 +622,7 @@ class HtmlGoldTests(CoverageTest): a = self.start_import_stop(cov, "a") cov.html_report(a, directory='out') - compare_html(gold_path("html/gold_a"), "out") + compare_html(gold_path("html/a"), "out") contains( "out/a_py.html", ('<span class="key">if</span> <span class="num">1</span> ' @@ -673,7 +673,7 @@ class HtmlGoldTests(CoverageTest): b = self.start_import_stop(cov, "b") cov.html_report(b, directory="out") - compare_html(gold_path("html/gold_b_branch"), "out") + compare_html(gold_path("html/b_branch"), "out") contains( "out/b_py.html", ('<span class="key">if</span> <span class="nam">x</span> ' @@ -730,7 +730,7 @@ else: bom = self.start_import_stop(cov, "bom") cov.html_report(bom, directory="out") - compare_html(gold_path("html/gold_bom"), "out") + compare_html(gold_path("html/bom"), "out") contains( "out/bom_py.html", '<span class="str">"3×4 = 12, ÷2 = 6±0"</span>', @@ -749,7 +749,7 @@ assert len(math) == 18 isolatin1 = self.start_import_stop(cov, "isolatin1") cov.html_report(isolatin1, directory="out") - compare_html(gold_path("html/gold_isolatin1"), "out") + compare_html(gold_path("html/isolatin1"), "out") contains( "out/isolatin1_py.html", '<span class="str">"3×4 = 12, ÷2 = 6±0"</span>', @@ -787,21 +787,21 @@ assert len(math) == 18 cov = coverage.Coverage(include=["./*"]) self.start_import_stop(cov, "main") cov.html_report(directory="out") - compare_html(gold_path("html/gold_omit_1"), "out") + compare_html(gold_path("html/omit_1"), "out") def test_omit_2(self): self.make_main_etc() cov = coverage.Coverage(include=["./*"]) self.start_import_stop(cov, "main") cov.html_report(directory="out", omit=["m1.py"]) - compare_html(gold_path("html/gold_omit_2"), "out") + compare_html(gold_path("html/omit_2"), "out") def test_omit_3(self): self.make_main_etc() cov = coverage.Coverage(include=["./*"]) self.start_import_stop(cov, "main") cov.html_report(directory="out", omit=["m1.py", "m2.py"]) - compare_html(gold_path("html/gold_omit_3"), "out") + compare_html(gold_path("html/omit_3"), "out") def test_omit_4(self): self.make_main_etc() @@ -813,7 +813,7 @@ assert len(math) == 18 cov = coverage.Coverage(config_file="omit4.ini", include=["./*"]) self.start_import_stop(cov, "main") cov.html_report(directory="out") - compare_html(gold_path("html/gold_omit_4"), "out") + compare_html(gold_path("html/omit_4"), "out") def test_omit_5(self): self.make_main_etc() @@ -831,7 +831,7 @@ assert len(math) == 18 cov = coverage.Coverage(config_file="omit5.ini", include=["./*"]) self.start_import_stop(cov, "main") cov.html_report() - compare_html(gold_path("html/gold_omit_5"), "out/omit_5") + compare_html(gold_path("html/omit_5"), "out/omit_5") def test_other(self): self.make_file("src/here.py", """\ @@ -860,7 +860,7 @@ assert len(math) == 18 for p in glob.glob("out/*_other_py.html"): os.rename(p, "out/blah_blah_other_py.html") - compare_html(gold_path("html/gold_other"), "out") + compare_html(gold_path("html/other"), "out") contains( "out/index.html", '<a href="here_py.html">here.py</a>', @@ -900,7 +900,7 @@ assert len(math) == 18 partial = self.start_import_stop(cov, "partial") cov.html_report(partial, directory="out") - compare_html(gold_path("html/gold_partial"), "out") + compare_html(gold_path("html/partial"), "out") contains( "out/partial_py.html", '<p id="t4" class="stm par run hide_run">', @@ -934,8 +934,8 @@ assert len(math) == 18 a = self.start_import_stop(cov, "a") cov.html_report(a, directory="out", extra_css="extra.css") - compare_html(gold_path("html/gold_styled"), "out") - compare(gold_path("html/gold_styled"), "out", file_pattern="*.css") + compare_html(gold_path("html/styled"), "out") + compare(gold_path("html/styled"), "out", file_pattern="*.css") contains( "out/a_py.html", '<link rel="stylesheet" href="extra.css" type="text/css">', @@ -1000,7 +1000,7 @@ assert len(math) == 18 unicode = self.start_import_stop(cov, "unicode") cov.html_report(unicode, directory="out") - compare_html(gold_path("html/gold_unicode"), "out") + compare_html(gold_path("html/unicode"), "out") contains( "out/unicode_py.html", '<span class="str">"ʎd˙ǝbɐɹǝʌoɔ"</span>', diff --git a/tests/test_xml.py b/tests/test_xml.py index f73728fc..185e6ad1 100644 --- a/tests/test_xml.py +++ b/tests/test_xml.py @@ -337,7 +337,7 @@ class XmlGoldTest(CoverageTest): cov = coverage.Coverage() a = self.start_import_stop(cov, "a") cov.xml_report(a, outfile="coverage.xml") - compare_xml(gold_path("html/gold_x_xml"), ".", actual_extra=True) + compare_xml(gold_path("xml/x_xml"), ".", actual_extra=True) def test_a_xml_2(self): self.make_file("a.py", """\ @@ -357,7 +357,7 @@ class XmlGoldTest(CoverageTest): cov = coverage.Coverage(config_file="run_a_xml_2.ini") a = self.start_import_stop(cov, "a") cov.xml_report(a) - compare_xml(gold_path("html/gold_x_xml"), "xml_2") + compare_xml(gold_path("xml/x_xml"), "xml_2") def test_y_xml_branch(self): self.make_file("y.py", """\ @@ -373,4 +373,4 @@ class XmlGoldTest(CoverageTest): cov = coverage.Coverage(branch=True) y = self.start_import_stop(cov, "y") cov.xml_report(y, outfile="y_xml_branch/coverage.xml") - compare_xml(gold_path("html/gold_y_xml_branch"), "y_xml_branch") + compare_xml(gold_path("xml/y_xml_branch"), "y_xml_branch") |