From 7cdb807f2ceb8be757ecf14acc60beef4fc9b699 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Tue, 29 Aug 2017 00:51:39 -0400 Subject: [tests] reuse tox virtualenv for e2e/functional --- tests/functional/features/environment.py | 2 +- tests/functional/features/steps/common.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/functional/features/environment.py b/tests/functional/features/environment.py index be7404c0..a7f65dd0 100644 --- a/tests/functional/features/environment.py +++ b/tests/functional/features/environment.py @@ -11,7 +11,7 @@ from selenium.webdriver.chrome.options import Options from leap.common.config import get_path_prefix -DEFAULT_IMPLICIT_WAIT_TIMEOUT_IN_S = 10 +DEFAULT_IMPLICIT_WAIT_TIMEOUT_IN_S = 20 HOME_PATH = os.path.abspath('./tmp/bitmask-test') VIRTUALENV = 'virtualenv' diff --git a/tests/functional/features/steps/common.py b/tests/functional/features/steps/common.py index d214af05..749b65f2 100644 --- a/tests/functional/features/steps/common.py +++ b/tests/functional/features/steps/common.py @@ -7,9 +7,8 @@ from selenium.webdriver.common.by import By from selenium.webdriver.support import expected_conditions as EC from selenium.webdriver.support.wait import WebDriverWait -TIMEOUT_IN_S = 20 - -DEFAULT_IMPLICIT_WAIT_TIMEOUT_IN_S = 10 +TIMEOUT_IN_S = 30 +DEFAULT_IMPLICIT_WAIT_TIMEOUT_IN_S = 20 def wait_until_element_is_invisible_by_locator(context, locator_tuple, -- cgit v1.2.3