Update an HTML gold test due to new peephole optimizations (adapted from master)

4 files changed, 50 insertions, 54 deletions

diff --git a/tests/farm/html/gold_partial/index.html b/tests/farm/html/gold_partial/index.html
index 40ffcc4c..8be2ed77 100644
--- a/tests/farm/html/gold_partial/index.html
+++ b/tests/farm/html/gold_partial/index.html
@@ -9,7 +9,7 @@
     <link rel="stylesheet" href="style.css" type="text/css">
     
     <script type="text/javascript" src="jquery.min.js"></script>
-    <script type="text/javascript" src="jquery.debounce.min.js"></script>
+    <script type="text/javascript" src="jquery.ba-throttle-debounce.min.js"></script>
     <script type="text/javascript" src="jquery.tablesorter.min.js"></script>
     <script type="text/javascript" src="jquery.hotkeys.js"></script>
     <script type="text/javascript" src="coverage_html.js"></script>
@@ -22,7 +22,7 @@
 <div id="header">
     <div class="content">
         <h1>Coverage report:
-            <span class="pc_cov">100%</span>
+            <span class="pc_cov">91%</span>
         </h1>
 
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
@@ -71,28 +71,28 @@
         <tfoot>
             <tr class="total">
                 <td class="name left">Total</td>
-                <td>8</td>
-                <td>0</td>
+                <td>7</td>
                 <td>0</td>
+                <td>1</td>
                 
                 <td>4</td>
-                <td>0</td>
+                <td>1</td>
                 
-                <td class="right" data-ratio="12 12">100%</td>
+                <td class="right" data-ratio="10 11">91%</td>
             </tr>
         </tfoot>
         <tbody>
             
             <tr class="file">
                 <td class="name left"><a href="partial_py.html">partial.py</a></td>
-                <td>8</td>
-                <td>0</td>
+                <td>7</td>
                 <td>0</td>
+                <td>1</td>
                 
                 <td>4</td>
-                <td>0</td>
+                <td>1</td>
                 
-                <td class="right" data-ratio="12 12">100%</td>
+                <td class="right" data-ratio="10 11">91%</td>
             </tr>
             
         </tbody>
@@ -106,8 +106,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="https://coverage.readthedocs.io/en/coverage-4.0a7">coverage.py v4.0a7</a>,
-            created at 2015-07-24 09:31
+            <a class="nav" href="https://coverage.readthedocs.io/en/coverage-4.5.2a1">coverage.py v4.5.2a1</a>,
+            created at 2018-11-12 07:20
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/gold_partial/partial_py.html b/tests/farm/html/gold_partial/partial_py.html
index 796153f1..f63799e6 100644
--- a/tests/farm/html/gold_partial/partial_py.html
+++ b/tests/farm/html/gold_partial/partial_py.html
@@ -8,7 +8,7 @@
     
     
     <meta http-equiv="X-UA-Compatible" content="IE=emulateIE7" />
-    <title>Coverage for partial.py: 100%</title>
+    <title>Coverage for partial.py: 91%</title>
     <link rel="stylesheet" href="style.css" type="text/css">
     
     <script type="text/javascript" src="jquery.min.js"></script>
@@ -24,19 +24,19 @@
 <div id="header">
     <div class="content">
         <h1>Coverage for <b>partial.py</b> :
-            <span class="pc_cov">100%</span>
+            <span class="pc_cov">91%</span>
         </h1>
 
         <img id="keyboard_icon" src="keybd_closed.png" alt="Show keyboard shortcuts" />
 
         <h2 class="stats">
-            8 statements &nbsp;
-            <span class="run hide_run shortkey_r button_toggle_run">8 run</span>
+            7 statements &nbsp;
+            <span class="run hide_run shortkey_r button_toggle_run">7 run</span>
             <span class="mis shortkey_m button_toggle_mis">0 missing</span>
-            <span class="exc shortkey_x button_toggle_exc">0 excluded</span>
+            <span class="exc shortkey_x button_toggle_exc">1 excluded</span>
 
             
-                <span class="par run hide_run shortkey_p button_toggle_par">0 partial</span>
+                <span class="par run hide_run shortkey_p button_toggle_par">1 partial</span>
             
         </h2>
     </div>
@@ -44,22 +44,22 @@
 
 <div class="help_panel">
     <img id="panel_icon" src="keybd_open.png" alt="Hide keyboard shortcuts" />
-<p class="legend">Hot-keys on this page</p>
+    <p class="legend">Hot-keys on this page</p>
     <div>
-<p class="keyhelp">
+    <p class="keyhelp">
         <span class="key">r</span>
         <span class="key">m</span>
         <span class="key">x</span>
         <span class="key">p</span> &nbsp; toggle line displays
     </p>
-<p class="keyhelp">
+    <p class="keyhelp">
         <span class="key">j</span>
         <span class="key">k</span> &nbsp; next/prev highlighted chunk
     </p>
-<p class="keyhelp">
+    <p class="keyhelp">
         <span class="key">0</span> &nbsp; (zero) top of page
     </p>
-<p class="keyhelp">
+    <p class="keyhelp">
         <span class="key">1</span> &nbsp; (one) first highlighted chunk
     </p>
     </div>
@@ -76,45 +76,45 @@
 <p id="n5" class="pln"><a href="#n5">5</a></p>
 <p id="n6" class="stm run hide_run"><a href="#n6">6</a></p>
 <p id="n7" class="pln"><a href="#n7">7</a></p>
-<p id="n8" class="stm run hide_run"><a href="#n8">8</a></p>
+<p id="n8" class="stm par run hide_run"><a href="#n8">8</a></p>
 <p id="n9" class="stm run hide_run"><a href="#n9">9</a></p>
 <p id="n10" class="pln"><a href="#n10">10</a></p>
 <p id="n11" class="stm run hide_run"><a href="#n11">11</a></p>
 <p id="n12" class="stm run hide_run"><a href="#n12">12</a></p>
 <p id="n13" class="pln"><a href="#n13">13</a></p>
-<p id="n14" class="stm run hide_run"><a href="#n14">14</a></p>
-<p id="n15" class="stm run hide_run"><a href="#n15">15</a></p>
+<p id="n14" class="pln"><a href="#n14">14</a></p>
+<p id="n15" class="pln"><a href="#n15">15</a></p>
 <p id="n16" class="pln"><a href="#n16">16</a></p>
 <p id="n17" class="pln"><a href="#n17">17</a></p>
-<p id="n18" class="pln"><a href="#n18">18</a></p>
+<p id="n18" class="stm run hide_run"><a href="#n18">18</a></p>
 <p id="n19" class="pln"><a href="#n19">19</a></p>
-<p id="n20" class="pln"><a href="#n20">20</a></p>
-<p id="n21" class="stm run hide_run"><a href="#n21">21</a></p>
-                
+<p id="n20" class="stm run hide_run"><a href="#n20">20</a></p>
+<p id="n21" class="exc"><a href="#n21">21</a></p>
+
             </td>
             <td class="text">
 <p id="t1" class="pln"><span class="com"># Licensed under the Apache License: http://www.apache.org/licenses/LICENSE-2.0</span><span class="strut">&nbsp;</span></p>
 <p id="t2" class="pln"><span class="com"># For details: https://bitbucket.org/ned/coveragepy/src/default/NOTICE.txt</span><span class="strut">&nbsp;</span></p>
 <p id="t3" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t4" class="pln"><span class="com"># partial branches</span><span class="strut">&nbsp;</span></p>
+<p id="t4" class="pln"><span class="com"># partial branches and excluded lines</span><span class="strut">&nbsp;</span></p>
 <p id="t5" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t6" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">3</span><span class="strut">&nbsp;</span></p>
+<p id="t6" class="stm run hide_run"><span class="nam">a</span> <span class="op">=</span> <span class="num">6</span><span class="strut">&nbsp;</span></p>
 <p id="t7" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t8" class="stm run hide_run"><span class="key">while</span> <span class="nam">True</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t9" class="stm run hide_run">&nbsp; &nbsp; <span class="key">break</span><span class="strut">&nbsp;</span></p>
+<p id="t8" class="stm par run hide_run"><span class="annotate short">8&#x202F;&#x219B;&#x202F;11</span><span class="annotate long">line 8 didn't jump to line 11, because the condition on line 8 was never false</span><span class="key">while</span> <span class="str">"no peephole"</span><span class="op">.</span><span class="nam">upper</span><span class="op">(</span><span class="op">)</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t9" class="stm run hide_run">    <span class="key">break</span><span class="strut">&nbsp;</span></p>
 <p id="t10" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t11" class="stm run hide_run"><span class="key">while</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t12" class="stm run hide_run">&nbsp; &nbsp; <span class="key">break</span><span class="strut">&nbsp;</span></p>
+<p id="t11" class="stm run hide_run"><span class="key">while</span> <span class="nam">a</span><span class="op">:</span>        <span class="com"># pragma: no branch</span><span class="strut">&nbsp;</span></p>
+<p id="t12" class="stm run hide_run">    <span class="key">break</span><span class="strut">&nbsp;</span></p>
 <p id="t13" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t14" class="stm run hide_run"><span class="key">while</span> <span class="nam">a</span><span class="op">:</span>&nbsp; &nbsp; &nbsp; &nbsp; <span class="com"># pragma: no branch</span><span class="strut">&nbsp;</span></p>
-<p id="t15" class="stm run hide_run">&nbsp; &nbsp; <span class="key">break</span><span class="strut">&nbsp;</span></p>
+<p id="t14" class="pln"><span class="key">if</span> <span class="num">0</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t15" class="pln">    <span class="nam">never_happen</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
 <p id="t16" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t17" class="pln"><span class="key">if</span> <span class="num">0</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t18" class="pln">&nbsp; &nbsp; <span class="nam">never_happen</span><span class="op">(</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+<p id="t17" class="pln"><span class="key">if</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t18" class="stm run hide_run">    <span class="nam">a</span> <span class="op">=</span> <span class="num">21</span><span class="strut">&nbsp;</span></p>
 <p id="t19" class="pln"><span class="strut">&nbsp;</span></p>
-<p id="t20" class="pln"><span class="key">if</span> <span class="num">1</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
-<p id="t21" class="stm run hide_run">&nbsp; &nbsp; <span class="nam">a</span> <span class="op">=</span> <span class="num">13</span><span class="strut">&nbsp;</span></p>
-                
+<p id="t20" class="stm run hide_run"><span class="key">if</span> <span class="nam">a</span> <span class="op">==</span> <span class="num">23</span><span class="op">:</span><span class="strut">&nbsp;</span></p>
+<p id="t21" class="exc">    <span class="key">raise</span> <span class="nam">AssertionError</span><span class="op">(</span><span class="str">"Can't"</span><span class="op">)</span><span class="strut">&nbsp;</span></p>
+
             </td>
         </tr>
     </table>
@@ -123,8 +123,8 @@
 <div id="footer">
     <div class="content">
         <p>
-            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-4.0a7">coverage.py v4.0a7</a>,
-            created at 2015-07-24 09:04
+            <a class="nav" href="index.html">&#xab; index</a> &nbsp; &nbsp; <a class="nav" href="https://coverage.readthedocs.io/en/coverage-4.5.2a1">coverage.py v4.5.2a1</a>,
+            created at 2018-11-12 07:20
         </p>
     </div>
 </div>
diff --git a/tests/farm/html/src/partial.py b/tests/farm/html/src/partial.py
index 0f8fbe3c..cdcc64b5 100644
--- a/tests/farm/html/src/partial.py
+++ b/tests/farm/html/src/partial.py
@@ -5,10 +5,7 @@
 
 a = 6
 
-while True:
-    break
-
-while 1:
+while "no peephole".upper():
     break
 
 while a:        # pragma: no branch
diff --git a/tests/test_html.py b/tests/test_html.py
index 9bb8f392..dcf61c71 100644
--- a/tests/test_html.py
+++ b/tests/test_html.py
@@ -772,13 +772,12 @@ class HtmlGoldTests(CoverageGoldTest):
         compare("gold_partial", "out/partial", size_within=10, file_pattern="*.html")
         contains(
             "out/partial/partial_py.html",
-            '<p id="t8" class="stm run hide_run">',
+            '<p id="t8" class="stm par run hide_run">',
             '<p id="t11" class="stm run hide_run">',
-            '<p id="t14" class="stm run hide_run">',
             # The "if 0" and "if 1" statements are optimized away.
-            '<p id="t17" class="pln">',
+            '<p id="t14" class="pln">',
             # The "raise AssertionError" is excluded by regex in the .ini.
-            '<p id="t24" class="exc">',
+            '<p id="t21" class="exc">',
         )
         contains(
             "out/partial/index.html",
@@ -786,7 +785,7 @@ class HtmlGoldTests(CoverageGoldTest):
         )
         contains(
             "out/partial/index.html",
-            '<span class="pc_cov">100%</span>'
+            '<span class="pc_cov">91%</span>'
         )
 
     def test_styled(self):