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

1 files changed, 8 insertions, 4 deletions

diff --git a/django/contrib/admin/tests.py b/django/contrib/admin/tests.py
index 24d8937eed..a8ece9d381 100644
--- a/django/contrib/admin/tests.py
+++ b/django/contrib/admin/tests.py
@@ -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()
-        cls.selenium = webdriver_class()
+        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):