REGRESSION (r238749): run-api-tests dies with AttributeError: 'IOSSimulatorPort'...
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 1 Dec 2018 00:26:01 +0000 (00:26 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 1 Dec 2018 00:26:01 +0000 (00:26 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238763 268f45cc-cd09-0410-ab3c-d52691b4dbfc

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

index b81be16..951d13a 100644 (file)
@@ -1,3 +1,16 @@
+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>
 
         [PSON] We are sometimes swapping processes even though there is an opened window with an opener link to us
index 9178bad..469953b 100644 (file)
@@ -26,7 +26,6 @@ import os
 
 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
 
 _log = logging.getLogger(__name__)
@@ -129,7 +128,7 @@ class Manager(object):
 
     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))