Modified: trunk/Tools/ChangeLog (188942 => 188943)
--- trunk/Tools/ChangeLog 2015-08-26 02:01:42 UTC (rev 188942)
+++ trunk/Tools/ChangeLog 2015-08-26 03:41:32 UTC (rev 188943)
@@ -1,3 +1,14 @@
+2015-08-25 Andy Estes <[email protected]>
+
+ [iOS] run-webkit-tests fails if watchOS SDK is installed
+ https://bugs.webkit.org/show_bug.cgi?id=148453
+
+ Reviewed by David Kilzer.
+
+ * Scripts/webkitpy/xcode/simulator.py:
+ (Simulator): Taught Simulator how to parse watchOS runtimes and devices.
+ * Scripts/webkitpy/xcode/simulator_unittest.py: Added tests.
+
2015-08-25 Aakash Jain <[email protected]>
iOS Simulator layout-tests fail to start while cleaning a directory structure if simulator is already running
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (188942 => 188943)
--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-08-26 02:01:42 UTC (rev 188942)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2015-08-26 03:41:32 UTC (rev 188943)
@@ -240,9 +240,9 @@
"""
device_type_re = re.compile('(?P<name>[^(]+)\((?P<identifier>[^)]+)\)')
runtime_re = re.compile(
- 'iOS (?P<version>[0-9]+\.[0-9])(?P<internal> Internal)? \([0-9]+\.[0-9]+ - (?P<build_version>[^)]+)\) \((?P<identifier>[^)]+)\)( \((?P<availability>[^)]+)\))?')
+ '(i|watch)OS (?P<version>[0-9]+\.[0-9])(?P<internal> Internal)? \([0-9]+\.[0-9]+ - (?P<build_version>[^)]+)\) \((?P<identifier>[^)]+)\)( \((?P<availability>[^)]+)\))?')
unavailable_version_re = re.compile('-- Unavailable: (?P<identifier>[^ ]+) --')
- version_re = re.compile('-- iOS (?P<version>[0-9]+\.[0-9]+)(?P<internal> Internal)? --')
+ version_re = re.compile('-- (i|watch)OS (?P<version>[0-9]+\.[0-9]+)(?P<internal> Internal)? --')
devices_re = re.compile(
'\s*(?P<name>[^(]+ )\((?P<udid>[^)]+)\) \((?P<state>[^)]+)\)( \((?P<availability>[^)]+)\))?')
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py (188942 => 188943)
--- trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2015-08-26 02:01:42 UTC (rev 188942)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator_unittest.py 2015-08-26 03:41:32 UTC (rev 188943)
@@ -46,9 +46,12 @@
iPad 2 (com.apple.CoreSimulator.SimDeviceType.iPad-2)
iPad Retina (com.apple.CoreSimulator.SimDeviceType.iPad-Retina)
iPad Air (com.apple.CoreSimulator.SimDeviceType.iPad-Air)
+Apple Watch - 38mm (com.apple.CoreSimulator.SimDeviceType.Apple-Watch-38mm)
+Apple Watch - 42mm (com.apple.CoreSimulator.SimDeviceType.Apple-Watch-42mm)
== Runtimes ==
iOS 8.0 (8.0 - 12A465) (com.apple.CoreSimulator.SimRuntime.iOS-8-0)
iOS 8.0 Internal (8.0 - Unknown) (com.apple.CoreSimulator.SimRuntime.iOS-8-0-Internal) (unavailable, runtime path not found)
+watchOS 2.0 (2.0 - 13S343) (com.apple.CoreSimulator.SimRuntime.watchOS-2-0)
== Devices ==
-- iOS 8.0 --
iPhone 4s (68D9A792-E3A9-462B-B211-762C6A5D3779) (Shutdown)
@@ -61,9 +64,12 @@
iPad Retina (733FC71E-22F4-4077-BF79-25C27EA881FC) (Shutdown)
iPad Air (67266841-82F3-4545-AED6-568B117E41A8) (Shutdown)
-- iOS 8.0 Internal --
+-- watchOS 2.0 --
+ Apple Watch - 38mm (00138CD2-D30C-4380-A30E-A70B88E1A3C5) (Shutdown)
+ Apple Watch - 42mm (186AD85E-9BE5-4734-BC33-DF50484AAFF0) (Shutdown)
''')
simulator = Simulator(host=self._host)
- self.assertEqual(8, len(simulator.device_types))
+ self.assertEqual(10, len(simulator.device_types))
device_type_iphone_4s = simulator.device_types[0]
self.assertEqual('iPhone 4s', device_type_iphone_4s.name)
@@ -97,8 +103,16 @@
self.assertEqual('iPad Air', device_type_ipad_air.name)
self.assertEqual('com.apple.CoreSimulator.SimDeviceType.iPad-Air', device_type_ipad_air.identifier)
- self.assertEqual(2, len(simulator.runtimes))
+ device_type_apple_watch_38mm = simulator.device_types[8]
+ self.assertEqual('Apple Watch - 38mm', device_type_apple_watch_38mm.name)
+ self.assertEqual('com.apple.CoreSimulator.SimDeviceType.Apple-Watch-38mm', device_type_apple_watch_38mm.identifier)
+ device_type_apple_watch_42mm = simulator.device_types[9]
+ self.assertEqual('Apple Watch - 42mm', device_type_apple_watch_42mm.name)
+ self.assertEqual('com.apple.CoreSimulator.SimDeviceType.Apple-Watch-42mm', device_type_apple_watch_42mm.identifier)
+
+ self.assertEqual(3, len(simulator.runtimes))
+
runtime_ios_8 = simulator.runtimes[0]
self.assertEqual('com.apple.CoreSimulator.SimRuntime.iOS-8-0', runtime_ios_8.identifier)
self.assertEqual(True, runtime_ios_8.available)
@@ -167,6 +181,25 @@
self.assertEqual(tuple([8, 0]), runtime_ios_8_internal.version)
self.assertEqual(0, len(runtime_ios_8_internal.devices))
+ runtime_watchos_2 = simulator.runtimes[2]
+ self.assertEqual('com.apple.CoreSimulator.SimRuntime.watchOS-2-0', runtime_watchos_2.identifier)
+ self.assertEqual(True, runtime_watchos_2.available)
+ self.assertEqual(False, runtime_watchos_2.is_internal_runtime)
+ self.assertEqual(tuple([2, 0]), runtime_watchos_2.version)
+ self.assertEqual(2, len(runtime_watchos_2.devices))
+
+ device_apple_watch_38mm = runtime_watchos_2.devices[0]
+ self.assertEqual('Apple Watch - 38mm', device_apple_watch_38mm.name)
+ self.assertEqual('00138CD2-D30C-4380-A30E-A70B88E1A3C5', device_apple_watch_38mm.udid)
+ self.assertEqual(True, device_apple_watch_38mm.available)
+ self.assertEqual(runtime_watchos_2, device_apple_watch_38mm.runtime)
+
+ device_apple_watch_42mm = runtime_watchos_2.devices[1]
+ self.assertEqual('Apple Watch - 42mm', device_apple_watch_42mm.name)
+ self.assertEqual('186AD85E-9BE5-4734-BC33-DF50484AAFF0', device_apple_watch_42mm.udid)
+ self.assertEqual(True, device_apple_watch_42mm.available)
+ self.assertEqual(runtime_watchos_2, device_apple_watch_42mm.runtime)
+
def test_invalid_device_types_header(self):
""" Tests that an invalid Device Types header throws an exception """
self._set_expected_xcrun_simctl_list('''XX Device Types XX
