Bugzilla: drop 'extensions' checking for redhat detection

crobinso · crobinso · commit c8c2bee2eb45 · 2020-01-11T19:26:08.000-05:00
This inserts an API call into class startup for all non-rh bugzilla
instances, which isn't very nice.

The other detection metric, of the url containing bugzilla.redhat.com,
should catch all RH bugzilla instances I know about. If someone needs
to trick things beyond that, they can use URL + "?bugzilla.redhat.com"
which shouldn't interfere with correct operation of the API

Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -269,15 +269,6 @@ def _detect_is_redhat_bugzilla(self):
             log.info("Using RHBugzilla for URL containing bugzilla.redhat.com")
             return True
 
-        try:
-            extensions = self._backend.bugzilla_extensions()
-            if "RedHat" in extensions.get('extensions', {}):
-                log.info("Found RedHat bugzilla extension, "
-                    "using RHBugzilla")
-                return True
-        except Exception:
-            log.debug("Failed to fetch bugzilla extensions", exc_info=True)
-
         return False
 
     def _init_class_from_url(self):
diff --git a/tests/mockbackend.py b/tests/mockbackend.py
@@ -14,12 +14,9 @@
 
 class BackendMock(_BackendBase):
     _version = None
-    _extensions = None
 
     def bugzilla_version(self):
         return {"version": self._version}
-    def bugzilla_extensions(self):
-        return self._extensions
 
     def __helper(self, args):
         # Grab the calling function name and use it to generate
@@ -107,24 +104,18 @@ def user_update(self, *args):
         return self.__helper(args)
 
 
-def _make_backend_class(version="6.0.0", extensions=None,
-        rhbz=False, **kwargs):
-    if not extensions:
-        extensions = {"extensions": {"foo": {"version": "0.01"}}}
-    if rhbz:
-        extensions["extensions"]['RedHat'] = {'version': '0.3'}
+def _make_backend_class(version="6.0.0", **kwargs):
 
     class TmpBackendClass(BackendMock):
         _version = version
-        _extensions = extensions
 
     for key, val in kwargs.items():
         setattr(TmpBackendClass, "_%s" % key, val)
 
     return TmpBackendClass
 
 
-def make_bz(bz_kwargs=None, **kwargs):
+def make_bz(bz_kwargs=None, rhbz=False, **kwargs):
     bz_kwargs = (bz_kwargs or {}).copy()
     if "url" in bz_kwargs:
         raise RuntimeError("Can't set 'url' in mock make_bz, use connect()")
@@ -135,5 +126,9 @@ def make_bz(bz_kwargs=None, **kwargs):
     backendclass = _make_backend_class(**kwargs)
     # pylint: disable=protected-access
     bz._get_backend_class = lambda *a, **k: backendclass
-    bz.connect("https:///TESTSUITEMOCK")
+
+    url = "https:///TESTSUITEMOCK"
+    if rhbz:
+        url += "?fakeredhat=bugzilla.redhat.com"
+    bz.connect(url)
     return bz
