diff options
| author | Florian Apolloner <florian@apolloner.eu> | 2013-09-17 18:38:12 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2013-09-17 18:39:25 +0200 |
| commit | 2c6079775e12366279dc0bb094ba860e4473be3c (patch) | |
| tree | 45aa37d835d0ffbd458b8004502a1a7142e60a84 /django | |
| parent | 5a424c2393bf9f2524b8075723e90298c1297846 (diff) | |
Destroy selenium before live server threads.
Ensure that selenium quits before the live server thread to
prevent occasional hangs when killing the live server.
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/admin/tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/contrib/admin/tests.py b/django/contrib/admin/tests.py index 93191f6a0d..6e11963a94 100644 --- a/django/contrib/admin/tests.py +++ b/django/contrib/admin/tests.py @@ -31,9 +31,9 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): @classmethod def _tearDownClassInternal(cls): - super(AdminSeleniumWebDriverTestCase, cls)._tearDownClassInternal() if hasattr(cls, 'selenium'): cls.selenium.quit() + super(AdminSeleniumWebDriverTestCase, cls)._tearDownClassInternal() def wait_until(self, callback, timeout=10): """ |