autotest: Signature of PossibleBrowser.Create() is changing.
This CL handles the situation before and after the change.
BUG=chromium:428967
TEST=login_LoginSuccess, before and after the patch
Change-Id: Iea4b274ef2559fd76481ed3ed3a05ce4cfed1941
Reviewed-on: https://chromium-review.googlesource.com/226815
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
(cherry picked from commit ef243fecf5fa3634efc0191aa44f59ecd4641d90)
Reviewed-on: https://chromium-review.googlesource.com/243061
Commit-Queue: Bernie Thompson <bhthompson@chromium.org>
Tested-by: Bernie Thompson <bhthompson@chromium.org>
diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index c7ef652..26c7e83 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import logging, os
+import inspect, logging, os
from telemetry.core import browser_finder, browser_options, exceptions
from telemetry.core import extension_to_load, util
@@ -88,7 +88,13 @@
for i in range(num_tries):
try:
browser_to_create = browser_finder.FindBrowser(finder_options)
- self._browser = browser_to_create.Create()
+ # TODO(achuith): Remove inspect and old Create call.
+ # crbug.com/428967.
+ if len(inspect.getargspec(browser_to_create.Create).args) == 1:
+ self._browser = browser_to_create.Create()
+ else:
+ self._browser = browser_to_create.Create(finder_options)
+
self._browser.Start()
break
except (util.TimeoutException, exceptions.LoginException) as e: