зеркало из https://github.com/github/vitess-gh.git
Updating chromedriver dependencies and pinning chromium version
There is currently a defect in chromium that causes it to crash, this pins chromium to a previous version Signed-off-by: Dan Kozlowski <koz@planetscale.com>
This commit is contained in:
Родитель
7afe66ce62
Коммит
f6eeeba579
|
@ -269,7 +269,7 @@ function install_chromedriver() {
|
|||
rm chromedriver_linux64.zip
|
||||
}
|
||||
if [ "$BUILD_TESTS" == 1 ] ; then
|
||||
install_dep "chromedriver" "2.44" "$VTROOT/dist/chromedriver" install_chromedriver
|
||||
install_dep "chromedriver" "73.0.3683.20" "$VTROOT/dist/chromedriver" install_chromedriver
|
||||
fi
|
||||
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
|
|||
automake \
|
||||
bison \
|
||||
bzip2 \
|
||||
chromium \
|
||||
chromium=70.0.3538.110-1~deb9u1 \
|
||||
curl \
|
||||
g++ \
|
||||
git \
|
||||
|
|
|
@ -42,6 +42,7 @@ import vtgate_gateway_flavor.discoverygateway
|
|||
|
||||
from selenium import webdriver
|
||||
from selenium.common.exceptions import WebDriverException
|
||||
from selenium.webdriver.chrome.options import Options
|
||||
|
||||
from vttest import mysql_flavor
|
||||
|
||||
|
@ -235,6 +236,13 @@ def reset_mysql_flavor():
|
|||
|
||||
def create_webdriver():
|
||||
"""Creates a webdriver object (local or remote for Travis)."""
|
||||
|
||||
# Set common Options
|
||||
chrome_options = Options()
|
||||
chrome_options.add_argument("--disable-gpu")
|
||||
chrome_options.add_argument("--no-sandbox")
|
||||
chrome_options.headless = True
|
||||
|
||||
if os.environ.get('CI') == 'true' and os.environ.get('TRAVIS') == 'true':
|
||||
username = os.environ['SAUCE_USERNAME']
|
||||
access_key = os.environ['SAUCE_ACCESS_KEY']
|
||||
|
@ -243,17 +251,22 @@ def create_webdriver():
|
|||
capabilities['build'] = os.environ['TRAVIS_BUILD_NUMBER']
|
||||
capabilities['platform'] = 'Linux'
|
||||
capabilities['browserName'] = 'chrome'
|
||||
capabilities['chromeOptions'] = chrome_options
|
||||
hub_url = '%s:%s@localhost:4445' % (username, access_key)
|
||||
driver = webdriver.Remote(
|
||||
desired_capabilities=capabilities,
|
||||
command_executor='http://%s/wd/hub' % hub_url)
|
||||
|
||||
else:
|
||||
# Only testing against Chrome for now
|
||||
os.environ['webdriver.chrome.driver'] = os.path.join(vtroot, 'dist')
|
||||
service_log_path = os.path.join(tmproot, 'chromedriver.log')
|
||||
|
||||
try:
|
||||
driver = webdriver.Chrome(service_args=['--verbose'],
|
||||
service_log_path=service_log_path)
|
||||
service_log_path=service_log_path,
|
||||
chrome_options=chrome_options
|
||||
)
|
||||
except WebDriverException as e:
|
||||
if 'Chrome failed to start' not in str(e):
|
||||
# Not a Chrome issue. Just re-raise the exception.
|
||||
|
|
Загрузка…
Ссылка в новой задаче