diff --git a/biscuit/core/tests/browser/test_selenium.py b/biscuit/core/tests/browser/test_selenium.py index e808f3fb1809300cdb0d16ea0c13cce1833aef6f..f8f32164fb9b04ce9e2d7f17de7890cac520a43f 100644 --- a/biscuit/core/tests/browser/test_selenium.py +++ b/biscuit/core/tests/browser/test_selenium.py @@ -2,15 +2,13 @@ import os import pytest -from django.test.selenium import SeleniumTestCase +from django.test.selenium import SeleniumTestCase, SeleniumTestCaseBase +SeleniumTestCaseBase.external_host = os.environ.get('TEST_HOST', '') or None +SeleniumTestCaseBase.browsers = list(filter(bool, os.environ.get('TEST_SELENIUM_BROWSERS', '').split(','))) +SeleniumTestCaseBase.selenium_hub = os.environ.get('TEST_SELENIUM_HUB', '') or None class SeleniumTests(SeleniumTestCase): - host = os.environ.get('TEST_LISTEN_ADDRESS', '') or '127.0.0.1' - external_host = os.environ.get('TEST_HOST', '') or None - browsers = list(filter(bool, os.environ.get('TEST_SELENIUM_BROWSERS', '').split(','))) - selenium_hub = 'http://%s/wd/hub' % os.environ.get('TEST_SELENIUM_HUB', '') or '127.0.0.1:4444' - @classmethod def _screenshot(cls, filename): screenshot_path = os.environ.get('TEST_SCREENSHOT_PATH', None) diff --git a/tox.ini b/tox.ini index 705a1ebdab62926484884f11884a78dd0204edb0..eee86dd5cf53b59a5f62df8c58b3149edc9f69f3 100644 --- a/tox.ini +++ b/tox.ini @@ -9,9 +9,8 @@ skip_install = true commands = pytest --pylama --cov=biscuit biscuit/core/ setenv = TEST_SCREENSHOT_PATH = {env:TEST_SCREENSHOT_PATH:} - TEST_SELENIUM_HUB = {env:TEST_SELENIUM_HUB:127.0.0.1:4444} + TEST_SELENIUM_HUB = {env:TEST_SELENIUM_HUB:} TEST_SELENIUM_BROWSERS = {env:TEST_SELENIUM_BROWSERS:} - TEST_LISTEN_ADDRESS = {env:TEST_LISTEN_ADDRESS:127.0.0.1} TEST_HOST = {env:TEST_HOST:} [pylama]