From 167307bedc414f3ea74e1f1aed2b3e30c5df8de0 Mon Sep 17 00:00:00 2001 From: Jon Chappell Date: Mon, 13 Apr 2015 14:07:51 -0400 Subject: Fix Issue 361, and update tests accordingly. --HG-- branch : issue361 --- tests/farm/html/run_a.py | 12 ++++++------ tests/farm/html/run_b_branch.py | 18 +++++++++--------- tests/farm/html/run_bom.py | 2 +- tests/farm/html/run_isolatin1.py | 2 +- tests/farm/html/run_other.py | 4 ++-- tests/farm/html/run_partial.py | 12 ++++++------ tests/farm/html/run_styled.py | 14 +++++++------- tests/farm/html/run_tabbed.py | 10 +++++----- tests/farm/html/run_unicode.py | 6 +++--- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tests/farm/html/run_a.py b/tests/farm/html/run_a.py index 7963d2e5..f510e117 100644 --- a/tests/farm/html/run_a.py +++ b/tests/farm/html/run_a.py @@ -13,14 +13,14 @@ runfunc(html_it, rundir="src") # 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_py.html", - "if 1 < 2", - "    a = 3", - "67%" + 'if 1 < 2', + '    a = 3', + '67%' ) contains("html_a/index.html", - "a.py", - "67%", - "67%", + 'a.py', + '67%', + '67%', ) clean("html_a") diff --git a/tests/farm/html/run_b_branch.py b/tests/farm/html/run_b_branch.py index c92252ce..388b5c5e 100644 --- a/tests/farm/html/run_b_branch.py +++ b/tests/farm/html/run_b_branch.py @@ -13,17 +13,17 @@ runfunc(html_it, rundir="src") # 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_py.html", - "if x < 2", - "    a = 3", - "70%", - "8", - "exit", - "23   25", + 'if x < 2', + '    a = 3', + '70%', + '8', + 'exit', + '23   25', ) contains("html_b_branch/index.html", - "b.py", - "70%", - "70%", + 'b.py', + '70%', + '70%', ) clean("html_b_branch") diff --git a/tests/farm/html/run_bom.py b/tests/farm/html/run_bom.py index 96949756..a6e6d8b8 100644 --- a/tests/farm/html/run_bom.py +++ b/tests/farm/html/run_bom.py @@ -15,7 +15,7 @@ runfunc(html_it, rundir="src") # 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_py.html", - ""3×4 = 12, ÷2 = 6±0"", + '"3×4 = 12, ÷2 = 6±0"', ) clean("html_bom") diff --git a/tests/farm/html/run_isolatin1.py b/tests/farm/html/run_isolatin1.py index bf3746d2..b03cd25c 100644 --- a/tests/farm/html/run_isolatin1.py +++ b/tests/farm/html/run_isolatin1.py @@ -15,7 +15,7 @@ runfunc(html_it, rundir="src") # 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_py.html", - ""3×4 = 12, ÷2 = 6±0"", + '"3×4 = 12, ÷2 = 6±0"', ) clean("html_isolatin1") diff --git a/tests/farm/html/run_other.py b/tests/farm/html/run_other.py index 05efa0fc..7c7f344a 100644 --- a/tests/farm/html/run_other.py +++ b/tests/farm/html/run_other.py @@ -19,8 +19,8 @@ for p in glob.glob("html_other/*_other_py.html"): # 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", - "here.py", - "other_py.html'>", "other.py", + 'here.py', + 'other_py.html">', 'other.py', ) clean("html_other") diff --git a/tests/farm/html/run_partial.py b/tests/farm/html/run_partial.py index 38790796..7330bb27 100644 --- a/tests/farm/html/run_partial.py +++ b/tests/farm/html/run_partial.py @@ -15,17 +15,17 @@ runfunc(html_it, rundir="src") # 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_py.html", - "

", - "

", - "

", + '

', + '

', + '

', # The "if 0" and "if 1" statements are optimized away. - "

", + '

', ) contains("html_partial/index.html", - "partial.py", + 'partial.py', ) contains("html_partial/index.html", - "100%" + '100%' ) clean("html_partial") diff --git a/tests/farm/html/run_styled.py b/tests/farm/html/run_styled.py index a18096a4..ebfbf3bc 100644 --- a/tests/farm/html/run_styled.py +++ b/tests/farm/html/run_styled.py @@ -14,15 +14,15 @@ runfunc(html_it, rundir="src") 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_py.html", - "", - "if 1 < 2", - "    a = 3", - "67%" + '', + 'if 1 < 2', + '    a = 3', + '67%' ) contains("html_styled/index.html", - "", - "a.py", - "67%" + '', + 'a.py', + '67%' ) clean("html_styled") diff --git a/tests/farm/html/run_tabbed.py b/tests/farm/html/run_tabbed.py index 679db2ed..3e8a900f 100644 --- a/tests/farm/html/run_tabbed.py +++ b/tests/farm/html/run_tabbed.py @@ -13,11 +13,11 @@ runfunc(html_it, rundir="src") contains("src/tabbed.py", "\tif x:\t\t\t\t\t# look nice") contains("html_tabbed/tabbed_py.html", - ">        if " - "x:" - "                    " - "               " - "# look nice" + '>        if ' + 'x:' + '                    ' + '               ' + '# look nice' ) doesnt_contain("html_tabbed/tabbed_py.html", "\t") diff --git a/tests/farm/html/run_unicode.py b/tests/farm/html/run_unicode.py index ba34f63e..455d0168 100644 --- a/tests/farm/html/run_unicode.py +++ b/tests/farm/html/run_unicode.py @@ -13,12 +13,12 @@ runfunc(html_it, rundir="src") # 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_py.html", - ""ʎd˙ǝbɐɹǝʌoɔ"", + '"ʎd˙ǝbɐɹǝʌoɔ"', ) contains_any("html_unicode/unicode_py.html", - ""db40,dd00: x��"", - ""db40,dd00: x󠄀"", + '"db40,dd00: x��"', + '"db40,dd00: x󠄀"', ) clean("html_unicode") -- cgit v1.2.1