<!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>[214569] 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/214569">214569</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-03-29 15:44:42 -0700 (Wed, 29 Mar 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>webkitpy: Robust test clean-up
https://bugs.webkit.org/show_bug.cgi?id=170255

Reviewed by Alexey Proskuryakov.

On-device testing is the motivation for this change.  Failure to run clean-up functions can
result in zombie processes, residual NFS mounts and other undesirable remnants from a failed
test run.  Make an effort to clean-up even if exceptions are thrown during set-up or clean-up.

* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._set_up_run): Clean up test run if set-up fails.
* Scripts/webkitpy/port/ios.py:
(IOSPort.clean_up_test_run): Continue cleaning up devices even after an exception is thrown.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportiospy">trunk/Tools/Scripts/webkitpy/port/ios.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214568 => 214569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2017-03-29 22:44:13 UTC (rev 214568)
+++ trunk/Tools/ChangeLog        2017-03-29 22:44:42 UTC (rev 214569)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2017-03-29  Jonathan Bedard  &lt;jbedard@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        webkitpy: Robust test clean-up
+        https://bugs.webkit.org/show_bug.cgi?id=170255
+
+        Reviewed by Alexey Proskuryakov.
+
+        On-device testing is the motivation for this change.  Failure to run clean-up functions can
+        result in zombie processes, residual NFS mounts and other undesirable remnants from a failed
+        test run.  Make an effort to clean-up even if exceptions are thrown during set-up or clean-up.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager._set_up_run): Clean up test run if set-up fails.
+        * Scripts/webkitpy/port/ios.py:
+        (IOSPort.clean_up_test_run): Continue cleaning up devices even after an exception is thrown.
+
+2017-03-29  Jonathan Bedard  &lt;jbedard@apple.com&gt;
+
</ins><span class="cx">         Simulator testing stops after the first crash
</span><span class="cx">         &lt;rdar://problem/31325362&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (214568 => 214569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py        2017-03-29 22:44:13 UTC (rev 214568)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py        2017-03-29 22:44:42 UTC (rev 214569)
</span><span class="lines">@@ -188,7 +188,11 @@
</span><span class="cx">         # Create the output directory if it doesn't already exist.
</span><span class="cx">         self._port.host.filesystem.maybe_make_directory(self._results_directory)
</span><span class="cx"> 
</span><del>-        self._port.setup_test_run(self._options.device_class)
</del><ins>+        try:
+            self._port.setup_test_run(self._options.device_class)
+        except:
+            self._port.clean_up_test_run()
+            raise
</ins><span class="cx">         return True
</span><span class="cx"> 
</span><span class="cx">     def run(self, args):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (214568 => 214569)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py        2017-03-29 22:44:13 UTC (rev 214568)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py        2017-03-29 22:44:42 UTC (rev 214569)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> 
</span><span class="cx"> import logging
</span><ins>+import traceback
</ins><span class="cx"> 
</span><span class="cx"> from webkitpy.common.memoized import memoized
</span><span class="cx"> from webkitpy.layout_tests.models.test_configuration import TestConfiguration
</span><span class="lines">@@ -124,5 +125,26 @@
</span><span class="cx">     def clean_up_test_run(self):
</span><span class="cx">         super(IOSPort, self).clean_up_test_run()
</span><span class="cx"> 
</span><ins>+        # Best effort to let every device teardown before throwing any exceptions here.
+        # Failure to teardown devices can leave things in a bad state.
+        exception_list = []
</ins><span class="cx">         for i in xrange(self.child_processes()):
</span><del>-            self.device_for_worker_number(i).finished_testing()
</del><ins>+            device = self.device_for_worker_number(i)
+            try:
+                self.device_for_worker_number(i).finished_testing()
+            except BaseException as e:
+                trace = traceback.format_exc()
+                if isinstance(e, Exception):
+                    exception_list.append([e, trace])
+                else:
+                    exception_list.append([Exception('Exception tearing down {}'.format(device)), trace])
+        if len(exception_list) == 1:
+            raise
+        elif len(exception_list) &gt; 1:
+            print '\n'
+            for exception in exception_list:
+                _log.error('{} raised: {}'.format(exception[0].__class__.__name__, exception[0]))
+                _log.error(exception[1])
+                _log.error('--------------------------------------------------')
+
+            raise RuntimeError('Multiple failures when teardown devices')
</ins></span></pre>
</div>
</div>

</body>
</html>