summaryrefslogtreecommitdiff
path: root/tests/functional
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2017-08-29 00:51:39 -0400
committerKali Kaneko <kali@leap.se>2017-08-30 16:18:57 -0400
commit7cdb807f2ceb8be757ecf14acc60beef4fc9b699 (patch)
treebc1315bdff0fb5210cde0d03d38b4e4f311d9627 /tests/functional
parentec3c4a21b24afac389a10bdbbb9ac36acd2a6ffb (diff)
[tests] reuse tox virtualenv for e2e/functional
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/features/environment.py2
-rw-r--r--tests/functional/features/steps/common.py5
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/functional/features/environment.py b/tests/functional/features/environment.py
index be7404c..a7f65dd 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 d214af0..749b65f 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,