bugzilla: Fix the class autodetection magic and test it

crobinso · crobinso · commit 033cf193013c · 2014-04-21T15:57:47.000-04:00
diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py
@@ -112,6 +112,7 @@ def _init_class_from_url(self, url, sslverify):
 
         self.__class__ = c
         log.info("Chose subclass %s v%s", c.__name__, c.version)
+        return True
 
 
 # This is the list of possible Bugzilla instances an app can use,
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -314,7 +314,13 @@ def __init__(self, url=None, user=None, password=None, cookiefile=-1,
                  sslverify=True):
         # Hook to allow Bugzilla autodetection without weirdly overriding
         # __init__
-        self._init_class_from_url(url, sslverify)
+        if self._init_class_from_url(url, sslverify):
+            kwargs = locals()
+            del(kwargs["self"])
+
+            # pylint: disable=non-parent-init-called
+            self.__class__.__init__(self, **kwargs)
+            return
 
         # Settings the user might want to tweak
         self.user = user or ''
diff --git a/tests/query.py b/tests/query.py
@@ -13,6 +13,7 @@
 import os
 import unittest
 
+import bugzilla
 from bugzilla.bugzilla3 import Bugzilla34
 from bugzilla.bugzilla4 import Bugzilla4
 from bugzilla.rhbugzilla import RHBugzilla4
@@ -309,3 +310,7 @@ def testStandardQuery(self):
             'order': 'bug_status,bug_id'
         }
         self._check(url, query)
+
+    def testBZAutoMagic(self):
+        bz = bugzilla.Bugzilla("bugzilla.redhat.com")
+        self.assertTrue(hasattr(bz, "rhbz_back_compat"))
