Changeset 238763 in webkit

Timestamp:

Nov 30, 2018 4:26:01 PM (5 years ago)

Author:

Jonathan Bedard

Message:

REGRESSION (r238749): run-api-tests dies with AttributeError: 'IOSSimulatorPort' object has no attribute 'DEFAULT_DEVICE_CLASS'
​https://bugs.webkit.org/show_bug.cgi?id=192257
<rdar://problem/46384671>

Reviewed by Stephanie Lewis.

Follow-up fix for r238749.

• Scripts/webkitpy/api_tests/manager.py:

(Manager._initialize_devices): Use DEFAULT_DEVICE_TYPE instead of DEFAULT_DEVICE_CLASS.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/api_tests/manager.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-30  Jonathan Bedard  <jbedard@apple.com>
+
+        REGRESSION (r238749): run-api-tests dies with AttributeError: 'IOSSimulatorPort' object has no attribute 'DEFAULT_DEVICE_CLASS'
+        https://bugs.webkit.org/show_bug.cgi?id=192257
+        <rdar://problem/46384671>
+
+        Reviewed by Stephanie Lewis.
+
+        Follow-up fix for r238749.
+
+        * Scripts/webkitpy/api_tests/manager.py:
+        (Manager._initialize_devices): Use DEFAULT_DEVICE_TYPE instead of DEFAULT_DEVICE_CLASS.
+
 2018-11-30  Chris Dumez  <cdumez@apple.com>
 

trunk/Tools/Scripts/webkitpy/api_tests/manager.py

@@ -27 +27 @@
 from webkitpy.api_tests.runner import Runner
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.xcode.device_type import DeviceType
 from webkitpy.xcode.simulated_device import DeviceRequest, SimulatedDeviceManager
 
@@ -130 +129 @@
     def _initialize_devices(self):
         if 'simulator' in self._port.port_name:
-            SimulatedDeviceManager.initialize_devices(DeviceRequest(DeviceType.from_string(self._port.DEFAULT_DEVICE_CLASS), allow_incomplete_match=True), self.host, simulator_ui=False)
+            SimulatedDeviceManager.initialize_devices(DeviceRequest(self._port.DEFAULT_DEVICE_TYPE, allow_incomplete_match=True), self.host, simulator_ui=False)
         elif 'device' in self._port.port_name:
             raise RuntimeError('Running api tests on {} is not supported'.format(self._port.port_name))