Attachment 357583 Details for Bug 192786 – Patch for landing

[patch] Patch for landing

bug-192786-20181218110431.patch (text/plain), 3.20 KB, created by Jonathan Bedard on 2018-12-18 11:04:32 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2018-12-18 11:04:32 PST

Size: 3.20 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 239340)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,20 @@
>+2018-12-18  Jonathan Bedard  <jbedard@apple.com>
>+
>+        webkitpy: Ignore device type for test when using --force
>+        https://bugs.webkit.org/show_bug.cgi?id=192786
>+        <rdar://problem/46794894>
>+
>+        Reviewed by Daniel Bates.
>+
>+        It is sometimes the case that a contributor will wish to run a test on a specific device,
>+        despite expectations which indicate a test should not be run on that device.
>+
>+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
>+        (parse_args):
>+        * Scripts/webkitpy/port/device_port.py:
>+        (DevicePort.default_child_processes): Strip device type information when using --force.
>+        (DevicePort.setup_test_run): Only allow incomplete match when using --force.
>+
> 2018-12-18  Alex Christensen  <achristensen@webkit.org>
> 
>         WKWebView has old URL while displaying SafeBrowsing interstitial, for link-click navigations
>Index: Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
>===================================================================
>--- Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py	(revision 239340)
>+++ Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py	(working copy)
>@@ -241,7 +241,8 @@ def parse_args(args):
>                  "'only' == only run the SKIP tests, "
>                  "'always' == always skip, even if listed on the command line.")),
>         optparse.make_option("--force", action="store_true", default=False,
>-            help="Run all tests with PASS as expected result, even those marked SKIP in the test list (implies --skipped=ignore)"),
>+            help="Run all tests with PASS as expected result, even those marked SKIP in the test list or " + \
>+                 "those which are device-specific (implies --skipped=ignore)"),
>         optparse.make_option("--time-out-ms",
>             help="Set the timeout for each test"),
>         optparse.make_option("--order", action="store", default="natural",
>Index: Tools/Scripts/webkitpy/port/device_port.py
>===================================================================
>--- Tools/Scripts/webkitpy/port/device_port.py	(revision 239340)
>+++ Tools/Scripts/webkitpy/port/device_port.py	(working copy)
>@@ -123,6 +123,10 @@ class DevicePort(DarwinPort):
>         if device_type.software_variant and self.DEFAULT_DEVICE_TYPE.software_variant != device_type.software_variant:
>             return 0
> 
>+        if self.get_option('force'):
>+            device_type.hardware_family = None
>+            device_type.hardware_type = None
>+
>         return self.DEVICE_MANAGER.device_count_for_type(
>             self._device_type_with_version(device_type),
>             host=self.host,
>@@ -146,7 +150,7 @@ class DevicePort(DarwinPort):
>             device_type,
>             use_booted_simulator=not self.get_option('dedicated_simulators', False),
>             use_existing_simulator=False,
>-            allow_incomplete_match=True,
>+            allow_incomplete_match=self.get_option('force'),
>         )
>         self.DEVICE_MANAGER.initialize_devices(
>             [request] * self.child_processes(),

Actions: View | Formatted Diff | Diff

Attachments on bug 192786: 357498 | 357502 | 357583