diff options
-rw-r--r-- | tests/farm/html/gold_other/blah_blah_other_py.html | 6 | ||||
-rw-r--r-- | tests/farm/html/gold_other/index.html | 4 | ||||
-rw-r--r-- | tests/test_html.py | 13 |
3 files changed, 13 insertions, 10 deletions
diff --git a/tests/farm/html/gold_other/blah_blah_other_py.html b/tests/farm/html/gold_other/blah_blah_other_py.html index 17b7ed3d..fb45d0bf 100644 --- a/tests/farm/html/gold_other/blah_blah_other_py.html +++ b/tests/farm/html/gold_other/blah_blah_other_py.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" /> - <title>Coverage for TEST_TMPDIR/othersrc/other.py: 100%</title> + <title>Coverage for /private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_81055852/othersrc/other.py: 100%</title> <link rel="stylesheet" href="style.css" type="text/css"> <script type="text/javascript" src="jquery.min.js"></script> <script type="text/javascript" src="jquery.hotkeys.js"></script> @@ -16,7 +16,7 @@ <body class="pyfile"> <div id="header"> <div class="content"> - <h1>Coverage for <b>TEST_TMPDIR/othersrc/other.py</b> : + <h1>Coverage for <b>/private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_81055852/othersrc/other.py</b> : <span class="pc_cov">100%</span> </h1> <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" /> @@ -78,7 +78,7 @@ <div class="content"> <p> <a class="nav" href="index.html">« index</a> <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>, - created at 2018-06-29 15:43 + created at 2018-08-22 19:08 </p> </div> </div> diff --git a/tests/farm/html/gold_other/index.html b/tests/farm/html/gold_other/index.html index 486506f6..a9c3d4cb 100644 --- a/tests/farm/html/gold_other/index.html +++ b/tests/farm/html/gold_other/index.html @@ -60,7 +60,7 @@ </tfoot> <tbody> <tr class="file"> - <td class="name left"><a href="_TEST_TMPDIR_othersrc_other_py.html">TEST_TMPDIR/othersrc/other.py</a></td> + <td class="name left"><a href="_private_var_folders_j2_gr3cj3jn63s5q8g3bjvw57hm0000gp_T_coverage_test_tests_test_html_HtmlGoldTests_test_other_81055852_othersrc_other_py.html">/private/var/folders/j2/gr3cj3jn63s5q8g3bjvw57hm0000gp/T/coverage_test/tests_test_html_HtmlGoldTests_test_other_81055852/othersrc/other.py</a></td> <td>1</td> <td>0</td> <td>0</td> @@ -83,7 +83,7 @@ <div class="content"> <p> <a class="nav" href="https://coverage.readthedocs.io/en/coverage-5.0a2">coverage.py v5.0a2</a>, - created at 2018-06-29 15:43 + created at 2018-08-22 19:08 </p> </div> </div> diff --git a/tests/test_html.py b/tests/test_html.py index d872c1b4..07ddba82 100644 --- a/tests/test_html.py +++ b/tests/test_html.py @@ -579,8 +579,11 @@ def compare_html(dir1, dir2): (r'/Users/ned/coverage/trunk/tests', 'TESTS_DIR'), (flat_rootname(unicode_class(TESTS_DIR)), '_TESTS_DIR'), (flat_rootname(u'/Users/ned/coverage/trunk/tests'), '_TESTS_DIR'), + # The temp dir the tests make. (re.escape(os.getcwd()), 'TEST_TMPDIR'), (flat_rootname(unicode_class(os.getcwd())), '_TEST_TMPDIR'), + (r'/private/var/folders/[\w/]{35}/coverage_test/tests_test_html_\w+_\d{8}', 'TEST_TMPDIR'), + (r'_private_var_folders_\w{35}_coverage_test_tests_test_html_\w+_\d{8}', '_TEST_TMPDIR'), ] if env.WINDOWS: # For file paths... @@ -898,15 +901,15 @@ assert len(math) == 18 cov.start() import here # pragma: nested # pylint: disable=unused-variable, import-error cov.stop() # pragma: nested - cov.html_report(directory="../out/other") + cov.html_report(directory="../out") # Different platforms will name the "other" file differently. Rename it - for p in glob.glob("out/other/*_other_py.html"): - os.rename(p, "out/other/blah_blah_other_py.html") + for p in glob.glob("out/*_other_py.html"): + os.rename(p, "out/blah_blah_other_py.html") - compare_html("out/other", gold_path("html/gold_other")) + compare_html("out", gold_path("html/gold_other")) contains( - "out/other/index.html", + "out/index.html", '<a href="here_py.html">here.py</a>', 'other_py.html">', 'other.py</a>', ) |