<!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>[214046] 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/214046">214046</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-03-16 10:12:33 -0700 (Thu, 16 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>webktpy: Fix device regular expression for parsing simctl output
https://bugs.webkit.org/show_bug.cgi?id=169757
Reviewed by Alex Christensen.
If a device is unavailable, the changes in <a href="http://trac.webkit.org/projects/webkit/changeset/213164">r213164</a> mean that the
name of the device will consume the UDID and return the state as
the device UDID and the availability string as the device state.
* Scripts/webkitpy/xcode/simulator.py:
(Simulator): Make UDID regular expression more strict.
* Scripts/webkitpy/xcode/simulator_unittest.py: Test an unavailable device.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulatorpy">trunk/Tools/Scripts/webkitpy/xcode/simulator.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulator_unittestpy">trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214045 => 214046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-16 16:49:13 UTC (rev 214045)
+++ trunk/Tools/ChangeLog 2017-03-16 17:12:33 UTC (rev 214046)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-16 Jonathan Bedard <jbedard@apple.com>
+
+ webktpy: Fix device regular expression for parsing simctl output
+ https://bugs.webkit.org/show_bug.cgi?id=169757
+
+ Reviewed by Alex Christensen.
+
+ If a device is unavailable, the changes in r213164 mean that the
+ name of the device will consume the UDID and return the state as
+ the device UDID and the availability string as the device state.
+
+ * Scripts/webkitpy/xcode/simulator.py:
+ (Simulator): Make UDID regular expression more strict.
+ * Scripts/webkitpy/xcode/simulator_unittest.py: Test an unavailable device.
+
</ins><span class="cx"> 2017-03-15 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Null deref under callAfterNextPresentationUpdate
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (214045 => 214046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2017-03-16 16:49:13 UTC (rev 214045)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2017-03-16 17:12:33 UTC (rev 214046)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> unavailable_version_re = re.compile('-- Unavailable: (?P<identifier>[^ ]+) --')
</span><span class="cx"> version_re = re.compile('-- (i|watch|tv)OS (?P<version>\d+\.\d+)(?P<internal> Internal)? --')
</span><span class="cx"> devices_re = re.compile(
</span><del>- '\s*(?P<name>.+) \((?P<udid>[^)]+)\) \((?P<state>[^)]+)\)( \((?P<availability>[^)]+)\))?')
</del><ins>+ '\s*(?P<name>.+) \((?P<udid>[A-Z0-9\-]+)\) \((?P<state>[^)]+)\)( \((?P<availability>[^)]+)\))?')
</ins><span class="cx">
</span><span class="cx"> managed_devices = {}
</span><span class="cx"> Device = None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulator_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py (214045 => 214046)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2017-03-16 16:49:13 UTC (rev 214045)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2017-03-16 17:12:33 UTC (rev 214046)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> iPad Retina (733FC71E-22F4-4077-BF79-25C27EA881FC) (Shutdown)
</span><span class="cx"> iPad Air (67266841-82F3-4545-AED6-568B117E41A8) (Shutdown)
</span><span class="cx"> iPad Pro (9.7 inch) (DEBD50B8-0566-4D7A-BCDB-4134CFE5DA40) (Shutdown)
</span><ins>+ iPhone 7 (2AE58BBE-0995-4326-9B65-2F413E2E33DC) (Shutdown) (unavailable, runtime profile not found)
</ins><span class="cx"> -- iOS 8.0 Internal --
</span><span class="cx"> -- tvOS 9.0 --
</span><span class="cx"> Apple TV 1080p (55281ABE-9C27-438B-AD50-C540D7BC4BAC) (Shutdown)
</span><span class="lines">@@ -133,7 +134,7 @@
</span><span class="cx"> self.assertEqual(True, runtime_ios_8.available)
</span><span class="cx"> self.assertEqual(False, runtime_ios_8.is_internal_runtime)
</span><span class="cx"> self.assertEqual(tuple([8, 0]), runtime_ios_8.version)
</span><del>- self.assertEqual(10, len(runtime_ios_8.devices))
</del><ins>+ self.assertEqual(11, len(runtime_ios_8.devices))
</ins><span class="cx">
</span><span class="cx"> device_iphone_4s = runtime_ios_8.devices[0]
</span><span class="cx"> self.assertEqual('iPhone 4s', device_iphone_4s.name)
</span><span class="lines">@@ -195,6 +196,12 @@
</span><span class="cx"> self.assertEqual(True, device_ipad_pro.available)
</span><span class="cx"> self.assertEqual(runtime_ios_8, device_ipad_pro.runtime)
</span><span class="cx">
</span><ins>+ device_iphone_7 = runtime_ios_8.devices[10]
+ self.assertEqual('iPhone 7', device_iphone_7.name)
+ self.assertEqual('2AE58BBE-0995-4326-9B65-2F413E2E33DC', device_iphone_7.udid)
+ self.assertEqual(False, device_iphone_7.available)
+ self.assertEqual(runtime_ios_8, device_iphone_7.runtime)
+
</ins><span class="cx"> runtime_ios_8_internal = simulator.runtimes[1]
</span><span class="cx"> self.assertEqual('com.apple.CoreSimulator.SimRuntime.iOS-8-0-Internal', runtime_ios_8_internal.identifier)
</span><span class="cx"> self.assertEqual(False, runtime_ios_8_internal.available)
</span></span></pre>
</div>
</div>
</body>
</html>