<!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>[277531] 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/277531">277531</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2021-05-14 21:58:16 -0700 (Fri, 14 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[run-webkit-tests] Handle missing simulator state plist
https://bugs.webkit.org/show_bug.cgi?id=225833
<rdar://problem/78036930>

Rubber-stamped by Aakash Jain.

* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDevice.state): If no device plist is found, assume the device is shut down.
* Scripts/webkitpy/xcode/simulated_device_unittest.py:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulated_devicepy">trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulated_device_unittestpy">trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (277530 => 277531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-05-15 04:18:38 UTC (rev 277530)
+++ trunk/Tools/ChangeLog       2021-05-15 04:58:16 UTC (rev 277531)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2021-05-14  Jonathan Bedard  <jbedard@apple.com>
</span><span class="cx"> 
</span><ins>+        [run-webkit-tests] Handle missing simulator state plist
+        https://bugs.webkit.org/show_bug.cgi?id=225833
+        <rdar://problem/78036930>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/webkitpy/xcode/simulated_device.py:
+        (SimulatedDevice.state): If no device plist is found, assume the device is shut down.
+        * Scripts/webkitpy/xcode/simulated_device_unittest.py:
+
+2021-05-14  Jonathan Bedard  <jbedard@apple.com>
+
</ins><span class="cx">         Fix iOS 14.5 embedded build
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=225835
</span><span class="cx">         <rdar://problem/78039315>
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulated_devicepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (277530 => 277531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py   2021-05-15 04:18:38 UTC (rev 277530)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py      2021-05-15 04:58:16 UTC (rev 277531)
</span><span class="lines">@@ -561,7 +561,11 @@
</span><span class="cx">             return self._state
</span><span class="cx"> 
</span><span class="cx">         device_plist = self.filesystem.expanduser(self.filesystem.join(SimulatedDeviceManager.simulator_device_path, self.udid, 'device.plist'))
</span><del>-        self._state = int(readPlist(self.filesystem.open_binary_file_for_reading(device_plist))['state'])
</del><ins>+        try:
+            self._state = int(readPlist(self.filesystem.open_binary_file_for_reading(device_plist))['state'])
+        except IOError:
+            self._state = SimulatedDevice.DeviceState.SHUTTING_DOWN
+
</ins><span class="cx">         self._last_updated_state = time.time()
</span><span class="cx">         return self._state
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulated_device_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py (277530 => 277531)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py  2021-05-15 04:18:38 UTC (rev 277530)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py     2021-05-15 04:58:16 UTC (rev 277531)
</span><span class="lines">@@ -678,3 +678,12 @@
</span><span class="cx">         SimulatedDeviceTest.change_state_to(SimulatedDeviceManager.INITIALIZED_DEVICES[0], SimulatedDevice.DeviceState.SHUT_DOWN)
</span><span class="cx">         SimulatedDeviceManager.tear_down(host)
</span><span class="cx">         self.assertIsNone(SimulatedDeviceManager.INITIALIZED_DEVICES)
</span><ins>+
+    def test_no_state_files(self):
+        SimulatedDeviceTest.reset_simulated_device_manager()
+        host = SimulatedDeviceTest.mock_host_for_simctl()
+        host.filesystem = MockFileSystem()
+        devices = SimulatedDeviceManager.available_devices(host)
+
+        for device in devices:
+            self.assertEquals(SimulatedDevice.DeviceState.SHUT_DOWN, device.state(force_update=True))
</ins></span></pre>
</div>
</div>

</body>
</html>