diff options
Diffstat (limited to 'testing/web-platform/tests/tools/wpt')
| -rw-r--r-- | testing/web-platform/tests/tools/wpt/android.py | 19 | ||||
| -rw-r--r-- | testing/web-platform/tests/tools/wpt/browser.py | 5 | ||||
| -rw-r--r-- | testing/web-platform/tests/tools/wpt/update.py | 1 |
3 files changed, 20 insertions, 5 deletions
diff --git a/testing/web-platform/tests/tools/wpt/android.py b/testing/web-platform/tests/tools/wpt/android.py index 89dc9fad25..f25350db07 100644 --- a/testing/web-platform/tests/tools/wpt/android.py +++ b/testing/web-platform/tests/tools/wpt/android.py @@ -17,9 +17,9 @@ here = os.path.abspath(os.path.dirname(__file__)) wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir)) -NDK_VERSION = "r25c" -CMDLINE_TOOLS_VERSION_STRING = "11.0" -CMDLINE_TOOLS_VERSION = "9644228" +NDK_VERSION = "r26c" +CMDLINE_TOOLS_VERSION_STRING = "12.0" +CMDLINE_TOOLS_VERSION = "11076708" AVD_MANIFEST_X86_64 = { "emulator_package": "system-images;android-24;default;x86_64", @@ -100,6 +100,8 @@ def install_fixed_emulator_version(logger, paths): emulator_path = os.path.join(paths["sdk"], "emulator") latest_emulator_path = os.path.join(paths["sdk"], "emulator_latest") + if os.path.exists(latest_emulator_path): + shutil.rmtree(latest_emulator_path) os.rename(emulator_path, latest_emulator_path) download_and_extract(url, paths["sdk"]) @@ -323,7 +325,16 @@ def start(logger, dest=None, reinstall=False, prompt=True, device_serial=None): emulator.start() timer = threading.Timer(300, cancel_start(threading.get_ident())) timer.start() - emulator.wait_for_start() + for i in range(10): + logger.info(f"Wait for emulator to start attempt {i + 1}/10") + try: + emulator.wait_for_start() + except Exception: + import traceback + logger.warning(f"""emulator.wait_for_start() failed: +{traceback.format_exc()}""") + else: + break timer.cancel() return emulator diff --git a/testing/web-platform/tests/tools/wpt/browser.py b/testing/web-platform/tests/tools/wpt/browser.py index c7f67d334e..2f9c453131 100644 --- a/testing/web-platform/tests/tools/wpt/browser.py +++ b/testing/web-platform/tests/tools/wpt/browser.py @@ -1282,6 +1282,11 @@ class Chrome(ChromeChromiumBase): version = self.version(browser_binary) if version is None: + # Check if the user has given a Chromium binary. + chromium = Chromium(self.logger) + if chromium.version(browser_binary): + raise ValueError("Provided binary is a Chromium binary and should be run using " + "\"./wpt run chromium\" or similar.") raise ValueError(f"Unable to detect browser version from binary at {browser_binary}. " " Cannot install ChromeDriver without a valid version to match.") diff --git a/testing/web-platform/tests/tools/wpt/update.py b/testing/web-platform/tests/tools/wpt/update.py index 4dba7e69df..06fe9bfbad 100644 --- a/testing/web-platform/tests/tools/wpt/update.py +++ b/testing/web-platform/tests/tools/wpt/update.py @@ -43,7 +43,6 @@ def update_expectations(_, **kwargs): update_properties = metadata.get_properties(properties_file=kwargs["properties_file"], extra_properties=kwargs["extra_property"], - config=kwargs["config"], product=kwargs["product"]) manifest_update(kwargs["test_paths"]) |