Commit 3c5775d3 authored by Florian Apolloner's avatar Florian Apolloner
Browse files

Delayed initialization of Selenium webdrivers. 

If setUpClass throws an exception (in this case "Address already in use" if the
super call can't find any open port to bind too) tearDownClass is not called.
This results in open browser windows from the webdriver, hence we only construct
it once we are sure there is no code afterwards which could error out.
parent bac86ad1

django/contrib/admin/tests.py

+2 −1
Original line number Diff line number Diff line
@@ -22,11 +22,12 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): 
        if not os.environ.get('DJANGO_SELENIUM_TESTS', False):

            raise SkipTest('Selenium tests not requested')

        try:

            cls.selenium = import_by_path(cls.webdriver_class)()

            webdriver_class = import_by_path(cls.webdriver_class)

        except Exception as e:

            raise SkipTest('Selenium webdriver "%s" not installed or not '

                           'operational: %s' % (cls.webdriver_class, str(e)))

        super(AdminSeleniumWebDriverTestCase, cls).setUpClass()

        cls.selenium = webdriver_class()



    @classmethod

    def tearDownClass(cls):