Commit 2fa0dd73 authored by Florian Apolloner's avatar Florian Apolloner
Browse files

Fixed error handling in 3c5775d3 for non-operational webdrivers.

parent 3c5775d3

django/contrib/admin/tests.py

+8 −4
Original line number Diff line number Diff line
@@ -23,11 +23,15 @@ class AdminSeleniumWebDriverTestCase(StaticLiveServerCase): 
            raise SkipTest('Selenium tests not requested')

        try:

            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)))

        except ImportError as e:

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

                            % (cls.webdriver_class, str(e)))

        super(AdminSeleniumWebDriverTestCase, cls).setUpClass()

        try:

            cls.selenium = webdriver_class()

        except Exception as e:

            raise SkipTest('Selenium webdriver "%s" not operational: %s'

                           % (cls.webdriver_class, str(e)))



    @classmethod

    def tearDownClass(cls):