<!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>[179793] 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/179793">179793</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-02-07 19:26:51 -0800 (Sat, 07 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] run-webkit-tests fails due to simulator devices from previous SDK installs being marked as unavailable
<http://webkit.org/b/141365>
Reviewed by Daniel Bates.
* Scripts/webkitpy/xcode/simulator.py:
(Simulator): Add unavailable_version_re precompiled regex.
(Simulator._parse_devices): Check for unavailable versions and
ignore them if found when parsing the output of
`xcrun simctl list`.
* Scripts/webkitpy/xcode/simulator_unittest.py:
(test_unavailable_devices): Add test with output from
`xcrun simctl list` with unavailable runtimes that fails before
the fix.</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 (179792 => 179793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-02-08 02:43:40 UTC (rev 179792)
+++ trunk/Tools/ChangeLog 2015-02-08 03:26:51 UTC (rev 179793)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-02-07 David Kilzer <ddkilzer@apple.com>
+
+ [iOS] run-webkit-tests fails due to simulator devices from previous SDK installs being marked as unavailable
+ <http://webkit.org/b/141365>
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitpy/xcode/simulator.py:
+ (Simulator): Add unavailable_version_re precompiled regex.
+ (Simulator._parse_devices): Check for unavailable versions and
+ ignore them if found when parsing the output of
+ `xcrun simctl list`.
+ * Scripts/webkitpy/xcode/simulator_unittest.py:
+ (test_unavailable_devices): Add test with output from
+ `xcrun simctl list` with unavailable runtimes that fails before
+ the fix.
+
</ins><span class="cx"> 2015-02-07 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Add Vector::removeFirstMatching() / removeAllMatching() methods taking lambda functions
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (179792 => 179793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-02-08 02:43:40 UTC (rev 179792)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-02-08 03:26:51 UTC (rev 179793)
</span><span class="lines">@@ -236,6 +236,7 @@
</span><span class="cx"> device_type_re = re.compile('(?P<name>[^(]+)\((?P<identifier>[^)]+)\)')
</span><span class="cx"> runtime_re = re.compile(
</span><span class="cx"> 'iOS (?P<version>[0-9]+\.[0-9])(?P<internal> Internal)? \([0-9]+\.[0-9]+ - (?P<build_version>[^)]+)\) \((?P<identifier>[^)]+)\)( \((?P<availability>[^)]+)\))?')
</span><ins>+ unavailable_version_re = re.compile('-- Unavailable: (?P<identifier>[^ ]+) --')
</ins><span class="cx"> version_re = re.compile('-- iOS (?P<version>[0-9]+\.[0-9]+)(?P<internal> Internal)? --')
</span><span class="cx"> devices_re = re.compile(
</span><span class="cx"> '\s*(?P<name>[^(]+ )\((?P<udid>[^)]+)\) \((?P<state>[^)]+)\)( \((?P<availability>[^)]+)\))?')
</span><span class="lines">@@ -337,14 +338,21 @@
</span><span class="cx"> current_runtime = self.runtime(version=version, is_internal_runtime=bool(version_match.group('internal')))
</span><span class="cx"> assert current_runtime
</span><span class="cx"> continue
</span><ins>+
+ unavailable_version_match = self.unavailable_version_re.match(line)
+ if unavailable_version_match:
+ current_runtime = None
+ continue
+
</ins><span class="cx"> device_match = self.devices_re.match(line)
</span><span class="cx"> if not device_match:
</span><span class="cx"> raise RuntimeError('Expected an iOS Simulator device line, got "{}"'.format(line))
</span><del>- device = Device(name=device_match.group('name').rstrip(),
- udid=device_match.group('udid'),
- available=device_match.group('availability') is None,
- runtime=current_runtime)
- current_runtime.devices.append(device)
</del><ins>+ if current_runtime:
+ device = Device(name=device_match.group('name').rstrip(),
+ udid=device_match.group('udid'),
+ available=device_match.group('availability') is None,
+ runtime=current_runtime)
+ current_runtime.devices.append(device)
</ins><span class="cx">
</span><span class="cx"> def device_type(self, name=None, identifier=None):
</span><span class="cx"> """
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulator_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py (179792 => 179793)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2015-02-08 02:43:40 UTC (rev 179792)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2015-02-08 03:26:51 UTC (rev 179793)
</span><span class="lines">@@ -196,3 +196,48 @@
</span><span class="cx"> with self.assertRaises(RuntimeError) as cm:
</span><span class="cx"> Simulator(host=self._host)
</span><span class="cx"> self.assertEqual('Expected == Devices == header but got: "XX Devices XX"', cm.exception.message)
</span><ins>+
+ def test_unavailable_devices(self):
+ """ Tests that unavailable devices are ignored """
+ self._set_expected_xcrun_simctl_list('''== Device Types ==
+iPhone 4s (com.apple.CoreSimulator.SimDeviceType.iPhone-4s)
+== Runtimes ==
+iOS 8.0 (8.0 - 12A465) (com.apple.CoreSimulator.SimRuntime.iOS-8-0)
+iOS 8.0 Internal (8.0 - Unknown) (com.apple.CoreSimulator.SimRuntime.iOS-8-0-Internal) (unavailable, runtime path not found)
+== Devices ==
+-- iOS 8.0 --
+ iPhone 4s (271BBEAC-1826-4CE1-B3AF-83F35CDD1D82) (Shutdown)
+-- iOS 8.0 Internal --
+-- Unavailable: com.apple.CoreSimulator.SimRuntime.iOS-8-1 --
+ iPhone 4s (08C0542B-65F7-46E8-B203-CB4055207BC8) (Shutdown) (unavailable, runtime profile not found)
+-- Unavailable: com.apple.CoreSimulator.SimRuntime.iOS-8-2 --
+ iPhone 4s (A36F7432-0AF5-49C4-A261-C44383992597) (Shutdown) (unavailable, runtime profile not found)
+''')
+ simulator = Simulator(host=self._host)
+ self.assertEqual(1, len(simulator.device_types))
+
+ device_type_iphone_4s = simulator.device_types[0]
+ self.assertEqual('iPhone 4s', device_type_iphone_4s.name)
+ self.assertEqual('com.apple.CoreSimulator.SimDeviceType.iPhone-4s', device_type_iphone_4s.identifier)
+
+ self.assertEqual(2, len(simulator.runtimes))
+
+ runtime_ios_8 = simulator.runtimes[0]
+ self.assertEqual('com.apple.CoreSimulator.SimRuntime.iOS-8-0', runtime_ios_8.identifier)
+ self.assertEqual(True, runtime_ios_8.available)
+ self.assertEqual(False, runtime_ios_8.is_internal_runtime)
+ self.assertEqual(tuple([8, 0]), runtime_ios_8.version)
+ self.assertEqual(1, len(runtime_ios_8.devices))
+
+ device_iphone_4s = runtime_ios_8.devices[0]
+ self.assertEqual('iPhone 4s', device_iphone_4s.name)
+ self.assertEqual('271BBEAC-1826-4CE1-B3AF-83F35CDD1D82', device_iphone_4s.udid)
+ self.assertEqual(True, device_iphone_4s.available)
+ self.assertEqual(runtime_ios_8, device_iphone_4s.runtime)
+
+ runtime_ios_8_internal = simulator.runtimes[1]
+ self.assertEqual('com.apple.CoreSimulator.SimRuntime.iOS-8-0-Internal', runtime_ios_8_internal.identifier)
+ self.assertEqual(False, runtime_ios_8_internal.available)
+ self.assertEqual(True, runtime_ios_8_internal.is_internal_runtime)
+ self.assertEqual(tuple([8, 0]), runtime_ios_8_internal.version)
+ self.assertEqual(0, len(runtime_ios_8_internal.devices))
</ins></span></pre>
</div>
</div>
</body>
</html>