From 2c6079775e12366279dc0bb094ba860e4473be3c Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Tue, 17 Sep 2013 18:38:12 +0200 Subject: [PATCH] Destroy selenium before live server threads. Ensure that selenium quits before the live server thread to prevent occasional hangs when killing the live server. --- django/contrib/admin/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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): """