Diff
Modified: trunk/Tools/ChangeLog (266276 => 266277)
--- trunk/Tools/ChangeLog 2020-08-28 13:37:03 UTC (rev 266276)
+++ trunk/Tools/ChangeLog 2020-08-28 15:21:30 UTC (rev 266277)
@@ -1,3 +1,17 @@
+2020-08-28 Jonathan Bedard <[email protected]>
+
+ [webkitcorepy] Move Timeout to webkitcorepy (Part 3)
+ https://bugs.webkit.org/show_bug.cgi?id=215584
+ <rdar://problem/67270713>
+
+ Reviewed by Darin Adler.
+
+ * Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py: Use webkitcorepy's Timeout object.
+ * Scripts/webkitpy/common/timeout_context.py: Removed.
+ * Scripts/webkitpy/port/simulator_process.py: Use webkitcorepy's Timeout object.
+ * Scripts/webkitpy/webdriver_plt/liveplt.py: Ditto.
+ * Scripts/webkitpy/xcode/simulated_device.py: Ditto.
+
2020-08-27 Lauro Moura <[email protected]>
REGRESSION(r266221) Layout tests step hanging due to slow WaveDiff comparison
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py (266276 => 266277)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py 2020-08-28 13:37:03 UTC (rev 266276)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/webserver_benchmark_runner.py 2020-08-28 15:21:30 UTC (rev 266277)
@@ -4,9 +4,10 @@
import logging
import sys
+from webkitcorepy import Timeout
+
from webkitpy.benchmark_runner.benchmark_runner import BenchmarkRunner
from webkitpy.benchmark_runner.http_server_driver.http_server_driver_factory import HTTPServerDriverFactory
-from webkitpy.common.timeout_context import Timeout
if sys.version_info > (3, 0):
from urllib.parse import urljoin
Deleted: trunk/Tools/Scripts/webkitpy/common/timeout_context.py (266276 => 266277)
--- trunk/Tools/Scripts/webkitpy/common/timeout_context.py 2020-08-28 13:37:03 UTC (rev 266276)
+++ trunk/Tools/Scripts/webkitpy/common/timeout_context.py 2020-08-28 15:21:30 UTC (rev 266277)
@@ -1,23 +0,0 @@
-# Copyright (C) 2017 Apple Inc. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-from webkitcorepy import Timeout
Modified: trunk/Tools/Scripts/webkitpy/port/simulator_process.py (266276 => 266277)
--- trunk/Tools/Scripts/webkitpy/port/simulator_process.py 2020-08-28 13:37:03 UTC (rev 266276)
+++ trunk/Tools/Scripts/webkitpy/port/simulator_process.py 2020-08-28 15:21:30 UTC (rev 266277)
@@ -25,7 +25,8 @@
import sys
import time
-from webkitpy.common.timeout_context import Timeout
+from webkitcorepy import Timeout
+
from webkitpy.port.server_process import ServerProcess
Modified: trunk/Tools/Scripts/webkitpy/webdriver_plt/liveplt.py (266276 => 266277)
--- trunk/Tools/Scripts/webkitpy/webdriver_plt/liveplt.py 2020-08-28 13:37:03 UTC (rev 266276)
+++ trunk/Tools/Scripts/webkitpy/webdriver_plt/liveplt.py 2020-08-28 15:21:30 UTC (rev 266277)
@@ -2,7 +2,6 @@
from selenium import webdriver
from time import sleep
from webkitpy.benchmark_runner.utils import get_driver_binary_path
-from webkitpy.common.timeout_context import Timeout
# FIXME: we want to avoid hardcoding the offsets
# we use this to make sure the window.innerHeight of each browser is the same
Modified: trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py (266276 => 266277)
--- trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2020-08-28 13:37:03 UTC (rev 266276)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py 2020-08-28 15:21:30 UTC (rev 266277)
@@ -27,12 +27,11 @@
import re
import time
-from webkitcorepy import Version
+from webkitcorepy import Version, Timeout
from webkitpy.common.memoized import memoized
from webkitpy.common.system.executive import ScriptError
from webkitpy.common.system.systemhost import SystemHost
-from webkitpy.common.timeout_context import Timeout
from webkitpy.port.device import Device
from webkitpy.xcode.device_type import DeviceType
