Unify bug_id querying

crobinso · crobinso · commit fe294d75beda · 2012-06-02T17:36:26.000-04:00
Upstream bugzilla has always named this paramater 'id' and taken it
as a list, not a comma separated string. RHBugzilla finally caught up
diff --git a/bin/bugzilla b/bin/bugzilla
@@ -111,7 +111,7 @@ def setup_action_parser(action):
     elif action == 'query':
         p.set_description("List bug reports that match the given criteria.")
         # General bug metadata
-        p.add_option('-b','--bug_id',
+        p.add_option('-b','--bug_id', default=None,
                 help="specify individual bugs by IDs, separated with commas")
         p.add_option('-p','--product',
                 help="product name, comma-separated (list with 'bugzilla info -p')")
@@ -390,6 +390,9 @@ def do_query(bz, opt, parser):
             stat = val.split(',')
         opt.bug_status = stat
 
+    if opt.bug_id:
+        opt.bug_id = opt.bug_id.split(",")
+
     built_query = bz.build_query(
         product=getattr(opt, "product", None),
         component=getattr(opt, "component", None),
diff --git a/bugzilla/bugzilla3.py b/bugzilla/bugzilla3.py
@@ -237,7 +237,7 @@ def listify(val):
             "component" : listify(component),
             "version" : version,
             "long_desc" : long_desc,
-            "bug_id" : bug_id,
+            "id" : bug_id,
             "short_desc" : short_desc,
             "bug_status" : status,
             "keywords" : keywords,
diff --git a/tests/query.py b/tests/query.py
@@ -28,7 +28,7 @@ def clicomm(self, argstr, out):
             self.assertDictEqual(q, out)
 
     def testBasicQuery(self):
-        self.clicomm("--product foo --component bar",
+        self.clicomm("--product foo --component bar --bug_id 1234,2480",
                      self._basic_query_out)
     def testOnline(self):
         self.clicomm("--product foo --oneline", self._online_out)
@@ -81,6 +81,7 @@ def testBooleanChart(self):
     bz = bz34
 
     _basic_query_out = {'product': ['foo'], 'component': ['bar'],
+        'id': ["1234", "2480"],
         'include_fields': ['bug_id', 'bug_status', 'assigned_to',
         'short_desc']}
     _online_out = {'product': ['foo'], 'include_fields': ['bug_id',
