<!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>[214431] 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/214431">214431</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-03-27 14:42:50 -0700 (Mon, 27 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: Reseting _device_map on each child process
<rdar://problem/31274476>
Unreviewed infrastructure fix.
* Scripts/webkitpy/port/ios_simulator.py:
(IOSSimulatorPort): Add _DEVICE_MAP class variable.
(IOSSimulatorPort.__init__): Use shared class variable
(IOSSimulatorPort._device_for_worker_number_map): Use _DEVICE_MAP class variable
(IOSSimulatorPort._create_devices): Ditto.
(IOSSimulatorPort._quit_ios_simulator): Ditto.
(IOSSimulatorPort.clean_up_test_run): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportios_simulatorpy">trunk/Tools/Scripts/webkitpy/port/ios_simulator.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214430 => 214431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-27 21:32:17 UTC (rev 214430)
+++ trunk/Tools/ChangeLog 2017-03-27 21:42:50 UTC (rev 214431)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-03-27 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><ins>+ REGRESSION: Reseting _device_map on each child process
+ <rdar://problem/31274476>
+
+ Unreviewed infrastructure fix.
+
+ * Scripts/webkitpy/port/ios_simulator.py:
+ (IOSSimulatorPort): Add _DEVICE_MAP class variable.
+ (IOSSimulatorPort.__init__): Use shared class variable
+ (IOSSimulatorPort._device_for_worker_number_map): Use _DEVICE_MAP class variable
+ (IOSSimulatorPort._create_devices): Ditto.
+ (IOSSimulatorPort._quit_ios_simulator): Ditto.
+ (IOSSimulatorPort.clean_up_test_run): Ditto.
+
+2017-03-27 Jonathan Bedard <jbedard@apple.com>
+
</ins><span class="cx"> REGRESSION: Failing to iterate over Simulator.managed_devices map
</span><span class="cx"> <rdar://problem/31274476>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportios_simulatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios_simulator.py (214430 => 214431)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2017-03-27 21:32:17 UTC (rev 214430)
+++ trunk/Tools/Scripts/webkitpy/port/ios_simulator.py 2017-03-27 21:42:50 UTC (rev 214431)
</span><span class="lines">@@ -67,6 +67,8 @@
</span><span class="cx"> },
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _DEVICE_MAP = {}
+
</ins><span class="cx"> def __init__(self, host, port_name, **kwargs):
</span><span class="cx"> super(IOSSimulatorPort, self).__init__(host, port_name, **kwargs)
</span><span class="cx">
</span><span class="lines">@@ -74,7 +76,6 @@
</span><span class="cx"> self._device_class = optional_device_class if optional_device_class else self.DEFAULT_DEVICE_CLASS
</span><span class="cx"> _log.debug('IOSSimulatorPort _device_class is %s', self._device_class)
</span><span class="cx">
</span><del>- self._device_map = {}
</del><span class="cx"> self._current_device = Device(Simulator(host).current_device())
</span><span class="cx"> if not self._current_device:
</span><span class="cx"> self.set_option('dedicated_simulators', True)
</span><span class="lines">@@ -84,7 +85,7 @@
</span><span class="cx"> self.set_option('child_processes', 1)
</span><span class="cx">
</span><span class="cx"> def _device_for_worker_number_map(self):
</span><del>- return self._device_map
</del><ins>+ return IOSSimulatorPort._DEVICE_MAP
</ins><span class="cx">
</span><span class="cx"> @property
</span><span class="cx"> @memoized
</span><span class="lines">@@ -241,12 +242,11 @@
</span><span class="cx"> for i in xrange(self.child_processes()):
</span><span class="cx"> Simulator.wait_until_device_is_booted(Simulator.managed_devices[i].udid)
</span><span class="cx">
</span><del>- self._device_map = {}
</del><ins>+ IOSSimulatorPort._DEVICE_MAP = {}
</ins><span class="cx"> for i in xrange(self.child_processes()):
</span><del>- self._device_map[i] = Device(Simulator.managed_devices[i])
</del><ins>+ IOSSimulatorPort._DEVICE_MAP[i] = Device(Simulator.managed_devices[i])
</ins><span class="cx">
</span><span class="cx"> def _quit_ios_simulator(self):
</span><del>- self._device_map = {}
</del><span class="cx"> if not self._using_dedicated_simulators():
</span><span class="cx"> return
</span><span class="cx"> _log.debug("_quit_ios_simulator killing all Simulator processes")
</span><span class="lines">@@ -291,6 +291,7 @@
</span><span class="cx">
</span><span class="cx"> except:
</span><span class="cx"> _log.warning('Unable to remove Simulator' + str(i))
</span><ins>+ IOSSimulatorPort._DEVICE_MAP = {}
</ins><span class="cx">
</span><span class="cx"> def setup_environ_for_server(self, server_name=None):
</span><span class="cx"> _log.debug("setup_environ_for_server")
</span></span></pre>
</div>
</div>
</body>
</html>