Title: [214431] trunk/Tools
- Revision
- 214431
- Author
- [email protected]
- Date
- 2017-03-27 14:42:50 -0700 (Mon, 27 Mar 2017)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (214430 => 214431)
--- trunk/Tools/ChangeLog 2017-03-27 21:32:17 UTC (rev 214430)
+++ trunk/Tools/ChangeLog 2017-03-27 21:42:50 UTC (rev 214431)
@@ -1,5 +1,20 @@
2017-03-27 Jonathan Bedard <[email protected]>
+ 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 <[email protected]>
+
REGRESSION: Failing to iterate over Simulator.managed_devices map
<rdar://problem/31274476>
Modified: trunk/Tools/Scripts/webkitpy/port/ios_simulator.py (214430 => 214431)
--- 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)
@@ -67,6 +67,8 @@
},
}
+ _DEVICE_MAP = {}
+
def __init__(self, host, port_name, **kwargs):
super(IOSSimulatorPort, self).__init__(host, port_name, **kwargs)
@@ -74,7 +76,6 @@
self._device_class = optional_device_class if optional_device_class else self.DEFAULT_DEVICE_CLASS
_log.debug('IOSSimulatorPort _device_class is %s', self._device_class)
- self._device_map = {}
self._current_device = Device(Simulator(host).current_device())
if not self._current_device:
self.set_option('dedicated_simulators', True)
@@ -84,7 +85,7 @@
self.set_option('child_processes', 1)
def _device_for_worker_number_map(self):
- return self._device_map
+ return IOSSimulatorPort._DEVICE_MAP
@property
@memoized
@@ -241,12 +242,11 @@
for i in xrange(self.child_processes()):
Simulator.wait_until_device_is_booted(Simulator.managed_devices[i].udid)
- self._device_map = {}
+ IOSSimulatorPort._DEVICE_MAP = {}
for i in xrange(self.child_processes()):
- self._device_map[i] = Device(Simulator.managed_devices[i])
+ IOSSimulatorPort._DEVICE_MAP[i] = Device(Simulator.managed_devices[i])
def _quit_ios_simulator(self):
- self._device_map = {}
if not self._using_dedicated_simulators():
return
_log.debug("_quit_ios_simulator killing all Simulator processes")
@@ -291,6 +291,7 @@
except:
_log.warning('Unable to remove Simulator' + str(i))
+ IOSSimulatorPort._DEVICE_MAP = {}
def setup_environ_for_server(self, server_name=None):
_log.debug("setup_environ_for_server")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
