tests: finish Bugzilla code coverage

crobinso · crobinso · commit b60617ae65b0 · 2020-01-10T18:38:41.000-05:00
Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -939,9 +939,6 @@ def _process_include_fields(self, include_fields, exclude_fields,
         Internal helper to process include_fields lists
         """
         def _convert_fields(_in):
-            if not _in:
-                return _in
-
             for newname, oldname in self._get_api_aliases():
                 if oldname in _in:
                     _in.remove(oldname)
@@ -1031,7 +1028,7 @@ def _getbugs(self, idlist, permissive,
 
         if self._check_version(4, 0):
             bugdict = dict([(b['id'], b) for b in r['bugs']])
-        else:
+        else:  # pragma: no cover
             bugdict = dict([(b['id'], b['internals']) for b in r['bugs']])
 
         ret = []
@@ -1258,12 +1255,13 @@ def query(self, query):
             r = self._backend.bug_search(query)
             log.debug("bug_search returned:\n%s", str(r))
         except Exception as e:
-            if not BugzillaError.get_bugzilla_error_code(e):
-                raise
-
             # Try to give a hint in the error message if url_to_query
             # isn't supported by this bugzilla instance
+            print("query_format" in str(e))
+            print(BugzillaError.get_bugzilla_error_code(e))
+            print(self._check_version(5, 0))
             if ("query_format" not in str(e) or
+                not BugzillaError.get_bugzilla_error_code(e) or
                 self._check_version(5, 0)):
                 raise
             raise BugzillaError("%s\nYour bugzilla instance does not "
diff --git a/tests/mockbackend.py b/tests/mockbackend.py
@@ -54,10 +54,14 @@ def bug_attachment_get_all(self, *args):
     def bug_attachment_update(self, *args):
         return self.__helper(args)
 
+    def bug_comments(self, *args):
+        return self.__helper(args)
     def bug_create(self, *args):
         return self.__helper(args)
     def bug_legal_values(self, *args):
         return self.__helper(args)
+    def bug_history(self, *args):
+        return self.__helper(args)
     def bug_get(self, *args):
         return self.__helper(args)
     def bug_fields(self, *args):
diff --git a/tests/test_api_misc.py b/tests/test_api_misc.py
@@ -260,3 +260,68 @@ def test_bad_scheme():
         bz.connect("ftp://example.com")
     except Exception as e:
         assert "Invalid URL scheme: ftp" in str(e)
+
+
+def test_update_flags():
+    # update_flags is just a compat wrapper for update_bugs
+    bz = tests.mockbackend.make_bz(
+        bug_update_args="data/mockargs/test_update_flags.txt",
+        bug_update_return={})
+    bz.update_flags([12345, 6789], {"name": "needinfo", "status": "?"})
+
+
+def test_bugs_history_raw():
+    # Stub test for bugs_history_raw
+    ids = ["12345", 567]
+    bz = tests.mockbackend.make_bz(
+        bug_history_args={"ids": ids},
+        bug_history_return={})
+    bz.bugs_history_raw(ids)
+
+
+def test_get_comments():
+    # Stub test for get_commands
+    ids = ["12345", 567]
+    bz = tests.mockbackend.make_bz(
+        bug_comments_args={"ids": ids},
+        bug_comments_return={})
+    bz.get_comments(ids)
+
+
+def test_get_xmlrpc_proxy():
+    # Ensure _proxy goes to a backend API
+    bz = tests.mockbackend.make_bz()
+    with pytest.raises(NotImplementedError):
+        dummy = bz._proxy  # pylint: disable=protected-access
+
+
+def test_query_url_fail():
+    # test some handling of query from_url errors
+    query = {"query_format": "advanced", "product": "FOO"}
+    checkstr = "does not appear to support"
+
+    exc = bugzilla.BugzillaError("FAKEERROR query_format", code=123)
+    bz = tests.mockbackend.make_bz(version="4.0.0",
+        bug_search_args=None, bug_search_return=exc)
+    try:
+        bz.query(query)
+    except Exception as e:
+        assert checkstr in str(e)
+
+    bz = tests.mockbackend.make_bz(version="5.1.0",
+        bug_search_args=None, bug_search_return=exc)
+    try:
+        bz.query(query)
+    except Exception as e:
+        assert checkstr not in str(e)
+
+
+def test_api_getbugs():
+    fakebz = tests.mockbackend.make_bz(
+        bug_get_args="data/mockargs/test_api_getbugs1.txt",
+        bug_get_return="data/mockreturn/test_query_cve_getbug.txt")
+
+    fakebz.bug_autorefresh = True
+    bug = fakebz.getbug("CVE-1234-5678", exclude_fields="foo")
+    assert bug.alias == ["CVE-1234-5678"]
+    assert bug.autorefresh is True
