<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[284227] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/284227">284227</a></dd>
<dt>Author</dt> <dd>lmoura@igalia.com</dd>
<dt>Date</dt> <dd>2021-10-14 19:20:48 -0700 (Thu, 14 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[webkitpy] Occasional exception thrown in change_result_to_failure when repeating flaky layout tests
https://bugs.webkit.org/show_bug.cgi?id=229788

Reviewed by Jonathan Bedard.

When a iterated/repeated flaky test moves from an unexpected Failure to
successive unexpected Pass, the currently stored result is still the
Failure (likely due to <a href="http://trac.webkit.org/projects/webkit/changeset/235467">r235467</a>). This may cause change_result_to_failure
to raise KeyError trying to forcibly remove() the Failure result from
the test_by_expectations set twice.

This commit relaxes the behavior to just ask to discard the value from
the set.

* Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:
(LayoutTestRunnerTests.test_update_summary_with_result): Added test case.
* Scripts/webkitpy/layout_tests/models/test_run_results.py:
(TestRunResults.change_result_to_failure): Use set.discard to avoid
KeyErrors.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollerslayout_test_runner_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_run_resultspy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (284226 => 284227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-10-15 02:02:14 UTC (rev 284226)
+++ trunk/Tools/ChangeLog       2021-10-15 02:20:48 UTC (rev 284227)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2021-10-14  Lauro Moura  <lmoura@igalia.com>
+
+        [webkitpy] Occasional exception thrown in change_result_to_failure when repeating flaky layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=229788
+
+        Reviewed by Jonathan Bedard.
+
+        When a iterated/repeated flaky test moves from an unexpected Failure to
+        successive unexpected Pass, the currently stored result is still the
+        Failure (likely due to r235467). This may cause change_result_to_failure
+        to raise KeyError trying to forcibly remove() the Failure result from
+        the test_by_expectations set twice.
+
+        This commit relaxes the behavior to just ask to discard the value from
+        the set.
+
+        * Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py:
+        (LayoutTestRunnerTests.test_update_summary_with_result): Added test case.
+        * Scripts/webkitpy/layout_tests/models/test_run_results.py:
+        (TestRunResults.change_result_to_failure): Use set.discard to avoid
+        KeyErrors.
+
</ins><span class="cx"> 2021-10-14  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Service workers running on the main thread should use the main VM
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollerslayout_test_runner_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py (284226 => 284227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py     2021-10-15 02:02:14 UTC (rev 284226)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner_unittest.py        2021-10-15 02:20:48 UTC (rev 284227)
</span><span class="lines">@@ -126,7 +126,8 @@
</span><span class="cx">         runner._options.world_leaks = False
</span><span class="cx">         test = 'failures/expected/reftest.html'
</span><span class="cx">         leak_test = 'failures/expected/leak.html'
</span><del>-        expectations = TestExpectations(runner._port, tests=[test, leak_test])
</del><ins>+        timeout_test = 'failures/expected/timeout.html'
+        expectations = TestExpectations(runner._port, tests=[test, leak_test, timeout_test])
</ins><span class="cx">         expectations.parse_all_expectations()
</span><span class="cx">         runner._expectations = expectations
</span><span class="cx"> 
</span><span class="lines">@@ -148,6 +149,24 @@
</span><span class="cx">         self.assertEqual(1, runner._current_run_results.expected)
</span><span class="cx">         self.assertEqual(0, runner._current_run_results.unexpected)
</span><span class="cx"> 
</span><ins>+        runner._current_run_results = TestRunResults(expectations, 3)
+        result = TestResult(timeout_test, failures=[])
+        runner.update_summary_with_result(result)
+        self.assertEqual(0, runner._current_run_results.expected)
+        self.assertEqual(1, runner._current_run_results.unexpected)
+        result = TestResult(timeout_test, failures=[test_failures.FailureTextMismatch()])
+        runner.update_summary_with_result(result)
+        self.assertEqual(0, runner._current_run_results.expected)
+        self.assertEqual(2, runner._current_run_results.unexpected)
+        result = TestResult(timeout_test, failures=[])
+        runner.update_summary_with_result(result)
+        self.assertEqual(0, runner._current_run_results.expected)
+        self.assertEqual(3, runner._current_run_results.unexpected)
+        result = TestResult(timeout_test, failures=[])
+        runner.update_summary_with_result(result)
+        self.assertEqual(0, runner._current_run_results.expected)
+        self.assertEqual(4, runner._current_run_results.unexpected)
+
</ins><span class="cx">     def test_servers_started(self):
</span><span class="cx"> 
</span><span class="cx">         def start_http_server():
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_run_resultspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py (284226 => 284227)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py     2021-10-15 02:02:14 UTC (rev 284226)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py        2021-10-15 02:20:48 UTC (rev 284227)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx">         if existing_result.type is new_result.type:
</span><span class="cx">             return
</span><span class="cx"> 
</span><del>-        self.tests_by_expectation[existing_result.type].remove(existing_result.test_name)
</del><ins>+        self.tests_by_expectation[existing_result.type].discard(existing_result.test_name)
</ins><span class="cx">         self.tests_by_expectation[new_result.type].add(new_result.test_name)
</span><span class="cx"> 
</span><span class="cx">         had_failures = len(existing_result.failures) > 0
</span></span></pre>
</div>
</div>

</body>
</html>