From ae6dc5f8884c9326444db75e3ec80958b4154436 Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 15 Apr 2015 13:06:29 +0100 Subject: [PATCH] Fix Chrome support so that --webdriver-binary is required and --binary is optional --- wptrunner/browsers/chrome.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wptrunner/browsers/chrome.py b/wptrunner/browsers/chrome.py index 9b87daa4aacfc1..adb77055ab7170 100644 --- a/wptrunner/browsers/chrome.py +++ b/wptrunner/browsers/chrome.py @@ -20,7 +20,7 @@ def check_args(**kwargs): - require_arg(kwargs, "binary") + require_arg(kwargs, "webdriver_binary") def browser_kwargs(**kwargs): @@ -34,9 +34,9 @@ def executor_kwargs(test_type, server_config, cache_manager, **kwargs): executor_kwargs = base_executor_kwargs(test_type, server_config, cache_manager, **kwargs) executor_kwargs["close_after_done"] = True - executor_kwargs["capabilities"] = dict(DesiredCapabilities.CHROME.items() + - {"chromeOptions": - {"binary": kwargs["binary"]}}.items()) + executor_kwargs["capabilities"] = dict(DesiredCapabilities.CHROME.items()) + if kwargs["binary"] is not None: + executor_kwargs["capabilities"]["chromeOptions"] = {"binary": kwargs["binary"]} return executor_kwargs