diff --git a/biscuit/core/tests/browser/test_selenium.py b/biscuit/core/tests/browser/test_selenium.py index 6b352c56d74548fc49fc99488f492d3a2d3c6cc3..e808f3fb1809300cdb0d16ea0c13cce1833aef6f 100644 --- a/biscuit/core/tests/browser/test_selenium.py +++ b/biscuit/core/tests/browser/test_selenium.py @@ -5,14 +5,11 @@ import pytest from django.test.selenium import SeleniumTestCase -if not os.environ.get('TEST_SELENIUM_HUB', None): - pytest.skip('Selenium hub not defined.', allow_module_level=True) - - class SeleniumTests(SeleniumTestCase): - external_host = os.environ.get('TEST_LISTEN_ADDRESS', '127.0.0.1') - browsers = ['chrome', 'firefox'] - selenium_hub = 'http://%s/wd/hub' % os.environ.get('TEST_SELENIUM_HUB', '127.0.0.1:4444') + 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): diff --git a/tox.ini b/tox.ini index 3a10d7fabc5859e27c93116ad684dded79a1b5f7..705a1ebdab62926484884f11884a78dd0204edb0 100644 --- a/tox.ini +++ b/tox.ini @@ -9,8 +9,10 @@ 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:} + TEST_SELENIUM_HUB = {env:TEST_SELENIUM_HUB:127.0.0.1:4444} + TEST_SELENIUM_BROWSERS = {env:TEST_SELENIUM_BROWSERS:} TEST_LISTEN_ADDRESS = {env:TEST_LISTEN_ADDRESS:127.0.0.1} + TEST_HOST = {env:TEST_HOST:} [pylama] linters = pycodestyle,pyflakes,radon