tests: Cover last remaining rhbz bits

crobinso · crobinso · commit de36ffce9f8e · 2014-04-21T15:57:47.000-04:00
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
@@ -35,12 +35,18 @@ def __init__(self, *args, **kwargs):
         @rhbz_back_compat: If True, convert parameters to the format they were
             in prior RHBZ upgrade in June 2012. Mostly this replaces lists
             with comma separated strings, and alters groups and flags.
-            Default is False
+            Default is False. Please don't use this in new code, just update
+            your scripts.
+        @multicall: Unused nowadays, will be removed in the future
         """
         # 'multicall' is no longer used, just ignore it
-        kwargs.pop("multicall", None)
+        multicall = kwargs.pop("multicall", None)
         self.rhbz_back_compat = bool(kwargs.pop("rhbz_back_compat", False))
 
+        if multicall is not None:
+            log.warn("multicall is unused and will be removed in a "
+                "future release.")
+
         if self.rhbz_back_compat:
             log.warn("rhbz_back_compat will be removed in a future release.")
 
@@ -90,7 +96,7 @@ def get_sub_component():
 
             if type(val) is not dict:
                 component = self._listify(kwargs.get("component"))
-                if component is []:
+                if not component:
                     raise ValueError("component must be specified if "
                         "specifying sub_component")
                 val = {component[0]: val}
diff --git a/tests/bug.py b/tests/bug.py
@@ -28,6 +28,8 @@ class BugTest(unittest.TestCase):
     def testBasic(self):
         data = {
             "bug_id": 123456,
+            "status": "NEW",
+            "assigned_to": "foo@bar.com",
             "component": "foo",
             "product": "bar",
             "short_desc": "some short desc",
@@ -52,6 +54,10 @@ def _assert_bug():
 
         _assert_bug()
 
+        self.assertEqual(str(bug),
+            "#123456 NEW        - foo@bar.com - some short desc")
+        self.assertTrue(repr(bug).startswith("<Bug #123456"))
+
         # This triggers some code in __getattr__
         dir(bug)
 
diff --git a/tests/misc.py b/tests/misc.py
@@ -12,6 +12,7 @@
 from __future__ import print_function
 
 import atexit
+import logging
 import os
 import shutil
 import sys
@@ -156,3 +157,16 @@ def _testPostCompare(bz, indict, outexpect):
 
         rhbz.rhbz_back_compat = True
         _testPostCompare(rhbz, test1, out_complex)
+
+    def testRHBZInit(self):
+        # Just get us coverage when the extra values are specified
+        level = bugzilla.log.level
+        bugzilla.log.setLevel(logging.ERROR)
+        bugzilla.RHBugzilla(None, cookiefile=None, multicall=True,
+            rhbz_back_compat=True)
+        bugzilla.log.setLevel(level)
+
+    def testUnimplementedAPI(self):
+        bz3 = bugzilla.Bugzilla3(None, cookiefile=None)
+        self.assertRaises(RuntimeError, bz3.getbugfields)
+        self.assertRaises(RuntimeError, bz3.getqueryinfo)
diff --git a/tests/modify.py b/tests/modify.py
@@ -185,3 +185,7 @@ def testCC(self):
     def testSubComponents(self):
         self.clicomm("--component foo --sub-component 'bar baz'",
             {"component": "foo", "sub_components": {"foo": "bar baz"}})
+
+    def testSubComponentFail(self):
+        self.assertRaises(ValueError, self.bz.build_update,
+            sub_component="some sub component")
diff --git a/tests/query.py b/tests/query.py
@@ -244,20 +244,38 @@ class RHBZTest(BZ4Test):
         'sub_components': ["Command-line tools (RHEL5)"]}
 
     def testTranslation(self):
+        def translate(_in):
+            _out = copy.deepcopy(_in)
+            self.bz.pre_translation(_out)
+            return _out
+
         in_query = {
             "fixed_in": "foo.bar",
             "product": "some-product",
             "cf_devel_whiteboard": "some_devel_whiteboard",
             "include_fields": ["fixed_in",
                 "components", "cf_devel_whiteboard"],
         }
-        out_query = copy.deepcopy(in_query)
-        self.bz.pre_translation(out_query)
+        out_query = translate(in_query)
 
         in_query["include_fields"] = [
             "cf_devel_whiteboard", "cf_fixed_in", "component"]
         self.assertDictEqual(in_query, out_query)
 
+        in_query = {"bug_id": "123,456", "component": "foo,bar"}
+        out_query = translate(in_query)
+        self.assertEqual(out_query["id"], ["123", "456"])
+        self.assertEqual(out_query["component"], ["foo", "bar"])
+
+        in_query = {"bug_id": [123, 124], "column_list": ["id"]}
+        out_query = translate(in_query)
+        self.assertEqual(out_query["id"], [123, 124])
+        self.assertEqual(out_query["include_fields"], in_query["column_list"])
+
+    def testInvalidBoolean(self):
+        self.assertRaises(RuntimeError, self.bz.build_query,
+            boolean_query="foobar")
+
 
 class TestURLToQuery(BZ34Test):
     def _check(self, url, query):
