[webkit-changes] [237612] trunk/Tools

Tue, 30 Oct 2018 17:46:14 -0700

Title: [237612] trunk/Tools
Revision
237612
Author
[email protected]
Date
2018-10-30 17:44:31 -0700 (Tue, 30 Oct 2018)

Log Message

webkitpy: Support alternate simctl list outputs
https://bugs.webkit.org/show_bug.cgi?id=191090
<rdar://problem/45684255>

Rubber-stamped by Aakash Jain.

* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDeviceManager._create_runtimes): Support alternative availability format.
(SimulatedDeviceManager._create_device_with_runtime): Ditto.
* Scripts/webkitpy/xcode/simulated_device_unittest.py:
(test_available_devices): Add iOS 12 with alternative availability format.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (237611 => 237612)


--- trunk/Tools/ChangeLog	2018-10-31 00:38:00 UTC (rev 237611)
+++ trunk/Tools/ChangeLog	2018-10-31 00:44:31 UTC (rev 237612)
@@ -1,3 +1,17 @@
+2018-10-30  Jonathan Bedard  <[email protected]>
+
+        webkitpy: Support alternate simctl list outputs
+        https://bugs.webkit.org/show_bug.cgi?id=191090
+        <rdar://problem/45684255>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/webkitpy/xcode/simulated_device.py:
+        (SimulatedDeviceManager._create_runtimes): Support alternative availability format.
+        (SimulatedDeviceManager._create_device_with_runtime): Ditto.
+        * Scripts/webkitpy/xcode/simulated_device_unittest.py:
+        (test_available_devices): Add iOS 12 with alternative availability format.
+
 2018-10-30  Alexey Proskuryakov  <[email protected]>
 
         Clean up some obsolete MAX_ALLOWED macros

Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (237611 => 237612)


--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2018-10-31 00:38:00 UTC (rev 237611)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py	2018-10-31 00:44:31 UTC (rev 237612)
@@ -77,7 +77,7 @@
     def _create_runtimes(runtimes):
         result = []
         for runtime in runtimes:
-            if runtime['availability'] != '(available)':
+            if runtime.get('availability') != '(available)' and runtime.get('isAvailable') != 'YES':
                 continue
             try:
                 result.append(SimulatedDeviceManager.Runtime(runtime))
@@ -87,7 +87,7 @@
 
     @staticmethod
     def _create_device_with_runtime(host, runtime, device_info):
-        if device_info['availability'] != '(available)':
+        if device_info.get('availability') != '(available)' and device_info.get('isAvailable') != 'YES':
             return None
 
         # Check existing devices.

Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py (237611 => 237612)


--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py	2018-10-31 00:38:00 UTC (rev 237611)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device_unittest.py	2018-10-31 00:44:31 UTC (rev 237612)
@@ -75,6 +75,10 @@
      "identifier" : "com.apple.CoreSimulator.SimDeviceType.iPhone-X"
    },
    {
+     "name" : "iPhone Xs",
+     "identifier" : "com.apple.CoreSimulator.SimDeviceType.iPhone-Xs"
+   },
+   {
      "name" : "iPad 2",
      "identifier" : "com.apple.CoreSimulator.SimDeviceType.iPad-2"
    },
@@ -175,6 +179,13 @@
      "name" : "watchOS 4.0",
      "identifier" : "com.apple.CoreSimulator.SimRuntime.watchOS-4-0",
      "version" : "4.0"
+   },
+   {
+     "buildversion" : "16A367",
+     "isAvailable" : "YES",
+     "name" : "iOS 12.0",
+     "identifier" : "com.apple.CoreSimulator.SimRuntime.iOS-12-0",
+     "version" : "12.0"
    }
  ],
  "devices" : {
@@ -413,6 +424,14 @@
        "name" : "iPad Pro (10.5-inch)",
        "udid" : "C92DDBB6-14AE-4B19-B9E5-4365FADE66E0"
      }
+   ],
+   "iOS 12.0" : [
+     {
+       "state" : "Shutdown",
+       "isAvailable" : "YES",
+       "name" : "iPhone Xs",
+       "udid" : "450C587D-70B1-54D9-9A56-2BD7B5FC01EF"
+     }
    ]
  },
  "pairs" : {
@@ -551,8 +570,8 @@
         self.assertEquals(2, len(SimulatedDeviceManager.device_by_filter(lambda device: device.platform_device.device_type == DeviceType.from_string('iPhone 5s'), host)))
         self.assertEquals(2, len(SimulatedDeviceManager.device_by_filter(lambda device: device.platform_device.device_type == DeviceType.from_string('iPhone 6s'), host)))
 
-        # 18 iPhones
-        self.assertEquals(18, len(SimulatedDeviceManager.device_by_filter(lambda device: device.platform_device.device_type == DeviceType.from_string('iPhone'), host)))
+        # 19 iPhones
+        self.assertEquals(19, len(SimulatedDeviceManager.device_by_filter(lambda device: device.platform_device.device_type == DeviceType.from_string('iPhone'), host)))
 
         # 11 iPads
         self.assertEquals(11, len(SimulatedDeviceManager.device_by_filter(lambda device: device.platform_device.device_type == DeviceType.from_string('iPad'), host)))
@@ -569,6 +588,9 @@
         # 11 iPhones running iOS 11.0
         self.assertEquals(11, len(SimulatedDeviceManager.device_by_filter(lambda device: device.platform_device.device_type == DeviceType(hardware_family='iPhone', software_version=Version(11, 0, 1)), host)))
 
+        # 1 device running iOS 12
+        self.assertEquals(1, len(SimulatedDeviceManager.device_by_filter(lambda device: device.platform_device.device_type == DeviceType(software_variant='iOS', software_version=Version(12, 0, 0)), host)))
+
     def test_existing_simulator(self):
         SimulatedDeviceTest.reset_simulated_device_manager()
         host = SimulatedDeviceTest.mock_host_for_simctl()

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to