diff options
| author | Honza Král <Honza.Kral@gmail.com> | 2013-02-23 08:55:34 -0800 |
|---|---|---|
| committer | Honza Král <Honza.Kral@gmail.com> | 2013-02-23 08:55:34 -0800 |
| commit | a05ab448f7a738d30ee7e8a513a65b6a67e8ea8e (patch) | |
| tree | 5fe9dd5035a21929b52b67652c12005ef23a1433 /django | |
| parent | 335a060fa6a919fc5eb1ff22315f9b3ae44438b7 (diff) | |
| parent | 1cd2f51eb43f9ed043982770b4efd5f28f53f302 (diff) | |
Merge pull request #781 from zsiciarz/ticket_19854
Fixed #19854 -- Added test runner option to skip Selenium tests
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/tests.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/django/contrib/admin/tests.py b/django/contrib/admin/tests.py index c99488cd41..30d63e4486 100644 --- a/django/contrib/admin/tests.py +++ b/django/contrib/admin/tests.py @@ -1,3 +1,5 @@ +import os + from django.test import LiveServerTestCase from django.utils.module_loading import import_by_path from django.utils.unittest import SkipTest @@ -8,6 +10,8 @@ class AdminSeleniumWebDriverTestCase(LiveServerTestCase): @classmethod def setUpClass(cls): + if os.environ.get('DJANGO_SKIP_SELENIUM_TESTS', False): + raise SkipTest('Selenium tests skipped by explicit request') try: cls.selenium = import_by_path(cls.webdriver_class)() except Exception as e: |