34 files changed, 22 insertions, 22 deletions
diff --git a/tests/farm/html/gold_a/a.html b/tests/farm/html/gold_a/a_py.html
index 03c1fc9..03c1fc9 100644
--- a/tests/farm/html/gold_a/a.html
+++ b/tests/farm/html/gold_a/a_py.html
diff --git a/tests/farm/html/gold_b_branch/b.html b/tests/farm/html/gold_b_branch/b_py.html
index 15b0666..15b0666 100644
--- a/tests/farm/html/gold_b_branch/b.html
+++ b/tests/farm/html/gold_b_branch/b_py.html
diff --git a/tests/farm/html/gold_bom/bom.html b/tests/farm/html/gold_bom/bom_py.html
index 40c64bd..40c64bd 100644
--- a/tests/farm/html/gold_bom/bom.html
+++ b/tests/farm/html/gold_bom/bom_py.html
diff --git a/tests/farm/html/gold_isolatin1/isolatin1.html b/tests/farm/html/gold_isolatin1/isolatin1_py.html
index 0e4ac95..0e4ac95 100644
--- a/tests/farm/html/gold_isolatin1/isolatin1.html
+++ b/tests/farm/html/gold_isolatin1/isolatin1_py.html
diff --git a/tests/farm/html/gold_omit_1/m1.html b/tests/farm/html/gold_omit_1/m1_py.html
index de44f78..de44f78 100644
--- a/tests/farm/html/gold_omit_1/m1.html
+++ b/tests/farm/html/gold_omit_1/m1_py.html
diff --git a/tests/farm/html/gold_omit_1/m2.html b/tests/farm/html/gold_omit_1/m2_py.html
index c775e6b..c775e6b 100644
--- a/tests/farm/html/gold_omit_1/m2.html
+++ b/tests/farm/html/gold_omit_1/m2_py.html
diff --git a/tests/farm/html/gold_omit_1/m3.html b/tests/farm/html/gold_omit_1/m3_py.html
index 67354c4..67354c4 100644
--- a/tests/farm/html/gold_omit_1/m3.html
+++ b/tests/farm/html/gold_omit_1/m3_py.html
diff --git a/tests/farm/html/gold_omit_1/main.html b/tests/farm/html/gold_omit_1/main_py.html
index a71b10e..a71b10e 100644
--- a/tests/farm/html/gold_omit_1/main.html
+++ b/tests/farm/html/gold_omit_1/main_py.html
diff --git a/tests/farm/html/gold_omit_2/m2.html b/tests/farm/html/gold_omit_2/m2_py.html
index c775e6b..c775e6b 100644
--- a/tests/farm/html/gold_omit_2/m2.html
+++ b/tests/farm/html/gold_omit_2/m2_py.html
diff --git a/tests/farm/html/gold_omit_2/m3.html b/tests/farm/html/gold_omit_2/m3_py.html
index 67354c4..67354c4 100644
--- a/tests/farm/html/gold_omit_2/m3.html
+++ b/tests/farm/html/gold_omit_2/m3_py.html
diff --git a/tests/farm/html/gold_omit_2/main.html b/tests/farm/html/gold_omit_2/main_py.html
index a71b10e..a71b10e 100644
--- a/tests/farm/html/gold_omit_2/main.html
+++ b/tests/farm/html/gold_omit_2/main_py.html
diff --git a/tests/farm/html/gold_omit_3/m3.html b/tests/farm/html/gold_omit_3/m3_py.html
index 67354c4..67354c4 100644
--- a/tests/farm/html/gold_omit_3/m3.html
+++ b/tests/farm/html/gold_omit_3/m3_py.html
diff --git a/tests/farm/html/gold_omit_3/main.html b/tests/farm/html/gold_omit_3/main_py.html
index a71b10e..a71b10e 100644
--- a/tests/farm/html/gold_omit_3/main.html
+++ b/tests/farm/html/gold_omit_3/main_py.html
diff --git a/tests/farm/html/gold_omit_4/m1.html b/tests/farm/html/gold_omit_4/m1_py.html
index de44f78..de44f78 100644
--- a/tests/farm/html/gold_omit_4/m1.html
+++ b/tests/farm/html/gold_omit_4/m1_py.html
diff --git a/tests/farm/html/gold_omit_4/m3.html b/tests/farm/html/gold_omit_4/m3_py.html
index 67354c4..67354c4 100644
--- a/tests/farm/html/gold_omit_4/m3.html
+++ b/tests/farm/html/gold_omit_4/m3_py.html
diff --git a/tests/farm/html/gold_omit_4/main.html b/tests/farm/html/gold_omit_4/main_py.html
index a71b10e..a71b10e 100644
--- a/tests/farm/html/gold_omit_4/main.html
+++ b/tests/farm/html/gold_omit_4/main_py.html
diff --git a/tests/farm/html/gold_omit_5/m1.html b/tests/farm/html/gold_omit_5/m1_py.html
index de44f78..de44f78 100644
--- a/tests/farm/html/gold_omit_5/m1.html
+++ b/tests/farm/html/gold_omit_5/m1_py.html
diff --git a/tests/farm/html/gold_omit_5/main.html b/tests/farm/html/gold_omit_5/main_py.html
index a71b10e..a71b10e 100644
--- a/tests/farm/html/gold_omit_5/main.html
+++ b/tests/farm/html/gold_omit_5/main_py.html
diff --git a/tests/farm/html/gold_other/blah_blah_other.html b/tests/farm/html/gold_other/blah_blah_other_py.html
index f070f3e..f070f3e 100644
--- a/tests/farm/html/gold_other/blah_blah_other.html
+++ b/tests/farm/html/gold_other/blah_blah_other_py.html
diff --git a/tests/farm/html/gold_other/here.html b/tests/farm/html/gold_other/here_py.html
index e091395..e091395 100644
--- a/tests/farm/html/gold_other/here.html
+++ b/tests/farm/html/gold_other/here_py.html
diff --git a/tests/farm/html/gold_partial/partial.html b/tests/farm/html/gold_partial/partial_py.html
index 64dfacf..64dfacf 100644
--- a/tests/farm/html/gold_partial/partial.html
+++ b/tests/farm/html/gold_partial/partial_py.html
diff --git a/tests/farm/html/gold_styled/a.html b/tests/farm/html/gold_styled/a_py.html
index 9fdaee1..9fdaee1 100644
--- a/tests/farm/html/gold_styled/a.html
+++ b/tests/farm/html/gold_styled/a_py.html
diff --git a/tests/farm/html/gold_unicode/unicode.html b/tests/farm/html/gold_unicode/unicode_py.html
index d67af56..d67af56 100644
--- a/tests/farm/html/gold_unicode/unicode.html
+++ b/tests/farm/html/gold_unicode/unicode_py.html
diff --git a/tests/farm/html/gold_x_xml/coverage.xml b/tests/farm/html/gold_x_xml/coverage.xml
index d5a8c44..f528e12 100644
--- a/tests/farm/html/gold_x_xml/coverage.xml
+++ b/tests/farm/html/gold_x_xml/coverage.xml
@@ -7,9 +7,9 @@
 		<source></source>
 	</sources>
 	<packages>
-		<package branch-rate="0" complexity="0" line-rate="0.6667" name="">
+		<package branch-rate="0" complexity="0" line-rate="0.6667" name="a">
 			<classes>
-				<class branch-rate="0" complexity="0" filename="a.py" line-rate="0.6667" name="a">
+				<class branch-rate="0" complexity="0" filename="a.py" line-rate="0.6667" name="a.py">
 					<methods/>
 					<lines>
 						<line hits="1" number="3"/>
diff --git a/tests/farm/html/gold_y_xml_branch/coverage.xml b/tests/farm/html/gold_y_xml_branch/coverage.xml
index 86e9e73..eb0c532 100644
--- a/tests/farm/html/gold_y_xml_branch/coverage.xml
+++ b/tests/farm/html/gold_y_xml_branch/coverage.xml
@@ -7,9 +7,9 @@
 		<source></source>
 	</sources>
 	<packages>
-		<package branch-rate="0.5" complexity="0" line-rate="0.8" name="">
+		<package branch-rate="0.5" complexity="0" line-rate="0.8" name="y">
 			<classes>
-				<class branch-rate="0.5" complexity="0" filename="y.py" line-rate="0.8" name="y">
+				<class branch-rate="0.5" complexity="0" filename="y.py" line-rate="0.8" name="y.py">
 					<methods/>
 					<lines>
 						<line hits="1" number="3"/>
diff --git a/tests/farm/html/run_a.py b/tests/farm/html/run_a.py
index 3fabd6f..7963d2e 100644
--- a/tests/farm/html/run_a.py
+++ b/tests/farm/html/run_a.py
@@ -12,13 +12,13 @@ runfunc(html_it, rundir="src")
 # HTML files will change often.  Check that the sizes are reasonable,
 #   and check that certain key strings are in the output.
 compare("gold_a", "html_a", size_within=10, file_pattern="*.html")
-contains("html_a/a.html",
+contains("html_a/a_py.html",
     "<span class='key'>if</span> <span class='num'>1</span> <span class='op'>&lt;</span> <span class='num'>2</span>",
     "&nbsp; &nbsp; <span class='nam'>a</span> <span class='op'>=</span> <span class='num'>3</span>",
     "<span class='pc_cov'>67%</span>"
     )
 contains("html_a/index.html",
-    "<a href='a.html'>a</a>",
+    "<a href='a_py.html'>a.py</a>",
     "<span class='pc_cov'>67%</span>",
     "<td class='right' data-ratio='2 3'>67%</td>",
     )
diff --git a/tests/farm/html/run_b_branch.py b/tests/farm/html/run_b_branch.py
index 0e584a6..c92252c 100644
--- a/tests/farm/html/run_b_branch.py
+++ b/tests/farm/html/run_b_branch.py
@@ -12,7 +12,7 @@ runfunc(html_it, rundir="src")
 # HTML files will change often.  Check that the sizes are reasonable,
 #   and check that certain key strings are in the output.
 compare("gold_b_branch", "html_b_branch", size_within=10, file_pattern="*.html")
-contains("html_b_branch/b.html",
+contains("html_b_branch/b_py.html",
     "<span class='key'>if</span> <span class='nam'>x</span> <span class='op'>&lt;</span> <span class='num'>2</span>",
     "&nbsp; &nbsp; <span class='nam'>a</span> <span class='op'>=</span> <span class='num'>3</span>",
     "<span class='pc_cov'>70%</span>",
@@ -21,7 +21,7 @@ contains("html_b_branch/b.html",
     "<span class='annotate' title='no jumps to these line numbers'>23&nbsp;&nbsp; 25</span>",
     )
 contains("html_b_branch/index.html",
-    "<a href='b.html'>b</a>",
+    "<a href='b_py.html'>b.py</a>",
     "<span class='pc_cov'>70%</span>",
     "<td class='right' data-ratio='16 23'>70%</td>",
     )
diff --git a/tests/farm/html/run_bom.py b/tests/farm/html/run_bom.py
index c35079b..9694975 100644
--- a/tests/farm/html/run_bom.py
+++ b/tests/farm/html/run_bom.py
@@ -14,7 +14,7 @@ runfunc(html_it, rundir="src")
 # HTML files will change often.  Check that the sizes are reasonable,
 #   and check that certain key strings are in the output.
 compare("gold_bom", "html_bom", size_within=10, file_pattern="*.html")
-contains("html_bom/bom.html",
+contains("html_bom/bom_py.html",
     "<span class='str'>&quot;3&#215;4 = 12, &#247;2 = 6&#177;0&quot;</span>",
     )
 
diff --git a/tests/farm/html/run_isolatin1.py b/tests/farm/html/run_isolatin1.py
index 063e6e0..bf3746d 100644
--- a/tests/farm/html/run_isolatin1.py
+++ b/tests/farm/html/run_isolatin1.py
@@ -14,7 +14,7 @@ runfunc(html_it, rundir="src")
 # HTML files will change often.  Check that the sizes are reasonable,
 #   and check that certain key strings are in the output.
 compare("gold_isolatin1", "html_isolatin1", size_within=10, file_pattern="*.html")
-contains("html_isolatin1/isolatin1.html",
+contains("html_isolatin1/isolatin1_py.html",
     "<span class='str'>&quot;3&#215;4 = 12, &#247;2 = 6&#177;0&quot;</span>",
     )
 
diff --git a/tests/farm/html/run_other.py b/tests/farm/html/run_other.py
index 23ce29f..05efa0f 100644
--- a/tests/farm/html/run_other.py
+++ b/tests/farm/html/run_other.py
@@ -12,15 +12,15 @@ runfunc(html_it, rundir="src", addtopath="../othersrc")
 # Different platforms will name the "other" file differently. Rename it
 import os, glob
 
-for p in glob.glob("html_other/*_other.html"):
-    os.rename(p, "html_other/blah_blah_other.html")
+for p in glob.glob("html_other/*_other_py.html"):
+    os.rename(p, "html_other/blah_blah_other_py.html")
 
 # HTML files will change often.  Check that the sizes are reasonable,
 #   and check that certain key strings are in the output.
 compare("gold_other", "html_other", size_within=10, file_pattern="*.html")
 contains("html_other/index.html",
-    "<a href='here.html'>here</a>",
-    "other.html'>", "other</a>",
+    "<a href='here_py.html'>here.py</a>",
+    "other_py.html'>", "other.py</a>",
     )
 
 clean("html_other")
diff --git a/tests/farm/html/run_partial.py b/tests/farm/html/run_partial.py
index eab1441..3879079 100644
--- a/tests/farm/html/run_partial.py
+++ b/tests/farm/html/run_partial.py
@@ -14,7 +14,7 @@ runfunc(html_it, rundir="src")
 # HTML files will change often.  Check that the sizes are reasonable,
 #   and check that certain key strings are in the output.
 compare("gold_partial", "html_partial", size_within=10, file_pattern="*.html")
-contains("html_partial/partial.html",
+contains("html_partial/partial_py.html",
     "<p id='t5' class='stm run hide_run'>",
     "<p id='t8' class='stm run hide_run'>",
     "<p id='t11' class='stm run hide_run'>",
@@ -22,7 +22,7 @@ contains("html_partial/partial.html",
     "<p id='t14' class='pln'>",
     )
 contains("html_partial/index.html",
-    "<a href='partial.html'>partial</a>",
+    "<a href='partial_py.html'>partial.py</a>",
     )
 contains("html_partial/index.html",
     "<span class='pc_cov'>100%</span>"
diff --git a/tests/farm/html/run_styled.py b/tests/farm/html/run_styled.py
index ac538ff..a18096a 100644
--- a/tests/farm/html/run_styled.py
+++ b/tests/farm/html/run_styled.py
@@ -13,7 +13,7 @@ runfunc(html_it, rundir="src")
 #   and check that certain key strings are in the output.
 compare("gold_styled", "html_styled", size_within=10, file_pattern="*.html")
 compare("gold_styled", "html_styled", size_within=10, file_pattern="*.css")
-contains("html_styled/a.html",
+contains("html_styled/a_py.html",
     "<link rel='stylesheet' href='extra.css' type='text/css'>",
     "<span class='key'>if</span> <span class='num'>1</span> <span class='op'>&lt;</span> <span class='num'>2</span>",
     "&nbsp; &nbsp; <span class='nam'>a</span> <span class='op'>=</span> <span class='num'>3</span>",
@@ -21,7 +21,7 @@ contains("html_styled/a.html",
     )
 contains("html_styled/index.html",
     "<link rel='stylesheet' href='extra.css' type='text/css'>",
-    "<a href='a.html'>a</a>",
+    "<a href='a_py.html'>a.py</a>",
     "<span class='pc_cov'>67%</span>"
     )
 
diff --git a/tests/farm/html/run_tabbed.py b/tests/farm/html/run_tabbed.py
index 0e9b527..679db2e 100644
--- a/tests/farm/html/run_tabbed.py
+++ b/tests/farm/html/run_tabbed.py
@@ -12,7 +12,7 @@ runfunc(html_it, rundir="src")
 # Editors like to change things, make sure our source file still has tabs.
 contains("src/tabbed.py", "\tif x:\t\t\t\t\t# look nice")
 
-contains("html_tabbed/tabbed.html",
+contains("html_tabbed/tabbed_py.html",
     ">&nbsp; &nbsp; &nbsp; &nbsp; <span class='key'>if</span> "
     "<span class='nam'>x</span><span class='op'>:</span>"
     "&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; "
@@ -20,5 +20,5 @@ contains("html_tabbed/tabbed.html",
     "<span class='com'># look nice</span>"
     )
 
-doesnt_contain("html_tabbed/tabbed.html", "\t")
+doesnt_contain("html_tabbed/tabbed_py.html", "\t")
 clean("html_tabbed")
diff --git a/tests/farm/html/run_unicode.py b/tests/farm/html/run_unicode.py
index c8cb6c5..ba34f63 100644
--- a/tests/farm/html/run_unicode.py
+++ b/tests/farm/html/run_unicode.py
@@ -12,11 +12,11 @@ runfunc(html_it, rundir="src")
 # HTML files will change often.  Check that the sizes are reasonable,
 #   and check that certain key strings are in the output.
 compare("gold_unicode", "html_unicode", size_within=10, file_pattern="*.html")
-contains("html_unicode/unicode.html",
+contains("html_unicode/unicode_py.html",
     "<span class='str'>&quot;&#654;d&#729;&#477;b&#592;&#633;&#477;&#652;o&#596;&quot;</span>",
     )
 
-contains_any("html_unicode/unicode.html",
+contains_any("html_unicode/unicode_py.html",
     "<span class='str'>&quot;db40,dd00: x&#56128;&#56576;&quot;</span>",
     "<span class='str'>&quot;db40,dd00: x&#917760;&quot;</span>",
     )