Changeset 238672 in webkit

Timestamp:

Nov 29, 2018, 10:00:14 AM (8 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Unify ios_version/watchos_version code
​https://bugs.webkit.org/show_bug.cgi?id=192153
<rdar://problem/46343642>

Reviewed by Lucas Forschler.

Treating watchOS and iOS versions differently makes it harder to share code between the similar ports.

• Scripts/webkitpy/port/device_port.py:

(DevicePort):
(DevicePort.device_version): Added.

• Scripts/webkitpy/port/ios.py:

(IOSPort.default_baseline_search_path): Use device_version() instead of ios_version().
(IOSPort.ios_version): Deleted.

• Scripts/webkitpy/port/ios_device.py:

(IOSDevicePort.device_version): Renamed from ios_version().
(IOSDevicePort.ios_version): Deleted.

• Scripts/webkitpy/port/ios_simulator.py:

(IOSSimulatorPort.device_version): Renamed from ios_version().
(IOSSimulatorPort.default_child_processes.booted_ios_devices_filter): Use device_version() instead of ios_version().
(IOSSimulatorPort._create_devices): Ditto.
(IOSSimulatorPort.check_sys_deps): Ditto.
(IOSSimulatorPort.ios_version): Deleted.

• Scripts/webkitpy/port/watch.py:

(WatchPort.default_baseline_search_path): Use device_version() instead of watchos_version().
(WatchPort.watchos_version): Deleted.

• Scripts/webkitpy/port/watch_device.py:

(WatchDevicePort.device_version): Renamed from watchos_version().
(WatchDevicePort.watchos_version): Deleted.

• Scripts/webkitpy/port/watch_simulator.py:

(WatchSimulatorPort.device_version): Renamed from watchos_version().
(WatchSimulatorPort.default_child_processes.filter_booted_watchos_devices): Use device_version() instead of watchos_version().
(WatchSimulatorPort._create_devices): Ditto.
(WatchSimulatorPort.check_sys_deps): Ditto.
(WatchSimulatorPort.watchos_version): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/device_port.py (modified) (1 diff)
• Scripts/webkitpy/port/ios.py (modified) (2 diffs)
• Scripts/webkitpy/port/ios_device.py (modified) (1 diff)
• Scripts/webkitpy/port/ios_simulator.py (modified) (4 diffs)
• Scripts/webkitpy/port/watch.py (modified) (2 diffs)
• Scripts/webkitpy/port/watch_device.py (modified) (1 diff)
• Scripts/webkitpy/port/watch_simulator.py (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-11-29  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Unify ios_version/watchos_version code
+        https://bugs.webkit.org/show_bug.cgi?id=192153
+        <rdar://problem/46343642>
+
+        Reviewed by Lucas Forschler.
+
+        Treating watchOS and iOS versions differently makes it harder to share code between the similar ports.
+
+        * Scripts/webkitpy/port/device_port.py:
+        (DevicePort):
+        (DevicePort.device_version): Added.
+        * Scripts/webkitpy/port/ios.py:
+        (IOSPort.default_baseline_search_path): Use device_version() instead of ios_version().
+        (IOSPort.ios_version): Deleted.
+        * Scripts/webkitpy/port/ios_device.py:
+        (IOSDevicePort.device_version): Renamed from ios_version().
+        (IOSDevicePort.ios_version): Deleted.
+        * Scripts/webkitpy/port/ios_simulator.py:
+        (IOSSimulatorPort.device_version): Renamed from ios_version().
+        (IOSSimulatorPort.default_child_processes.booted_ios_devices_filter): Use device_version() instead of ios_version().
+        (IOSSimulatorPort._create_devices): Ditto.
+        (IOSSimulatorPort.check_sys_deps): Ditto.
+        (IOSSimulatorPort.ios_version): Deleted.
+        * Scripts/webkitpy/port/watch.py:
+        (WatchPort.default_baseline_search_path): Use device_version() instead of watchos_version().
+        (WatchPort.watchos_version): Deleted.
+        * Scripts/webkitpy/port/watch_device.py:
+        (WatchDevicePort.device_version): Renamed from watchos_version().
+        (WatchDevicePort.watchos_version): Deleted.
+        * Scripts/webkitpy/port/watch_simulator.py:
+        (WatchSimulatorPort.device_version): Renamed from watchos_version().
+        (WatchSimulatorPort.default_child_processes.filter_booted_watchos_devices): Use device_version() instead of watchos_version().
+        (WatchSimulatorPort._create_devices): Ditto.
+        (WatchSimulatorPort.check_sys_deps): Ditto.
+        (WatchSimulatorPort.watchos_version): Deleted.
+
 2018-11-28  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/device_port.py

@@ -161 +161 @@
         env['XML_CATALOG_FILES'] = ''  # work around missing /etc/catalog <rdar://problem/4292995>
         return env
+
+    def device_version(self):
+        raise NotImplementedError

trunk/Tools/Scripts/webkitpy/port/ios.py

@@ -57 +57 @@
 
         versions_to_fallback = []
-        if self.ios_version().major == self.CURRENT_VERSION.major:
+        if self.device_version().major == self.CURRENT_VERSION.major:
             versions_to_fallback = [self.CURRENT_VERSION]
-        elif self.ios_version():
-            temp_version = Version(self.ios_version().major)
+        elif self.device_version():
+            temp_version = Version(self.device_version().major)
             while temp_version != self.CURRENT_VERSION:
                 versions_to_fallback.append(Version.from_iterable(temp_version))
@@ -110 +110 @@
     def test_expectations_file_position(self):
         return 4
-
-    def ios_version(self):
-        raise NotImplementedError

trunk/Tools/Scripts/webkitpy/port/ios_device.py

@@ -88 +88 @@
 
     @memoized
-    def ios_version(self):
+    def device_version(self):
         if self.get_option('version'):
             return Version.from_string(self.get_option('version'))

trunk/Tools/Scripts/webkitpy/port/ios_simulator.py

@@ -61 +61 @@
 
     @memoized
-    def ios_version(self):
+    def device_version(self):
         if self.get_option('version'):
             return Version.from_string(self.get_option('version'))
@@ -71 +71 @@
             if not device.platform_device.is_booted_or_booting():
                 return False
-            return device.platform_device.device_type in DeviceType(software_variant='iOS',
-                                                                    software_version=self.ios_version())
+            return device.platform_device.device_type in DeviceType(software_variant='iOS', software_version=self.device_version())
 
         if not self.get_option('dedicated_simulators', False):
@@ -85 +84 @@
     def _create_devices(self, device_class):
         self._set_device_class(device_class)
-        device_type = DeviceType.from_string(self._device_class, self.ios_version())
+        device_type = DeviceType.from_string(self._device_class, self.device_version())
 
         _log.debug('\nCreating devices for {}'.format(device_type))
@@ -129 +128 @@
 
     def check_sys_deps(self):
-        target_device_type = DeviceType(software_variant='iOS', software_version=self.ios_version())
+        target_device_type = DeviceType(software_variant='iOS', software_version=self.device_version())
         for device in SimulatedDeviceManager.available_devices(self.host):
             if device.platform_device.device_type in target_device_type:

trunk/Tools/Scripts/webkitpy/port/watch.py

@@ -60 +60 @@
     def default_baseline_search_path(self):
         versions_to_fallback = []
-        if self.watchos_version() == self.CURRENT_VERSION:
+        if self.device_version() == self.CURRENT_VERSION:
             versions_to_fallback = [self.CURRENT_VERSION]
-        elif self.watchos_version():
-            temp_version = Version(self.watchos_version().major)
+        elif self.device_version():
+            temp_version = Version(self.device_version().major)
             while temp_version.major != self.CURRENT_VERSION.major:
                 versions_to_fallback.append(Version.from_iterable(temp_version))
@@ -98 +98 @@
 
         return expectations
-
-    def watchos_version(self):
-        # The implementation of this function differs between on-device and simulator testing.
-        raise NotImplementedError

trunk/Tools/Scripts/webkitpy/port/watch_device.py

@@ -86 +86 @@
 
     @memoized
-    def watchos_version(self):
+    def device_version(self):
         if self.get_option('version'):
             return Version.from_string(self.get_option('version'))

trunk/Tools/Scripts/webkitpy/port/watch_simulator.py

@@ -63 +63 @@
 
     @memoized
-    def watchos_version(self):
+    def device_version(self):
         if self.get_option('version'):
             return Version.from_string(self.get_option('version'))
@@ -84 +84 @@
             if not device.platform_device.is_booted_or_booting():
                 return False
-            return device.platform_device.device_type in DeviceType(software_variant='watchOS', software_version=self.watchos_version())
+            return device.platform_device.device_type in DeviceType(software_variant='watchOS', software_version=self.device_version())
 
         if not self.get_option('dedicated_simulators', False):
@@ -97 +97 @@
     def _create_devices(self, device_class):
         self._set_device_class(device_class)
-        device_type = DeviceType.from_string(self._device_class, self.watchos_version())
+        device_type = DeviceType.from_string(self._device_class, self.device_version())
 
         _log.debug('\nCreating devices for {}'.format(device_type))
@@ -113 +113 @@
 
     def check_sys_deps(self):
-        target_device_type = DeviceType(software_variant='watchOS', software_version=self.watchos_version())
+        target_device_type = DeviceType(software_variant='watchOS', software_version=self.device_version())
         for device in SimulatedDeviceManager.available_devices(self.host):
             if device.platform_device.device_type in target_device_type: