bugzilla: Move query longdesc handling to general code

crobinso · crobinso · commit 3f901697dc39 · 2016-05-25T10:44:47.000-04:00
This was just a convenience wrapper for some query_format=advanced
behavior, which is available for upstream bugzilla now, so move it
to common code.
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -1064,7 +1064,6 @@ def build_query(self,
             ('devel_whiteboard', devel_whiteboard),
             ('alias', alias),
             ('boolean_query', boolean_query),
-            ('long_desc', long_desc),
             ('quicksearch', quicksearch),
             ('savedsearch', savedsearch),
             ('sharer_id', savedsearch_sharer_id),
@@ -1098,6 +1097,11 @@ def build_query(self,
             "tag": self._listify(tags),
         }
 
+        if long_desc is not None:
+            query["query_format"] = "advanced"
+            query["longdesc"] = long_desc
+            query["longdesc_type"] = "allwordssubstr"
+
         # 'include_fields' only available for Bugzilla4+
         query.update(self._process_include_fields(
             include_fields, exclude_fields, None))
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
@@ -353,15 +353,6 @@ def _add_key(paramname, keyname, listify=False):
                 val = self._listify(val)
             query[keyname] = val
 
-        def add_longdesc():
-            val = kwargs.pop("long_desc", None)
-            if val is None:
-                return
-
-            query["query_format"] = "advanced"
-            query["longdesc"] = val
-            query["longdesc_type"] = "allwordssubstr"
-
         def add_email(key, count):
             value = kwargs.pop(key, None)
             if value is None:
@@ -466,8 +457,6 @@ def make_bool_str(prefix):
         chart_id = add_boolean("alias", "alias", chart_id)
         chart_id = add_boolean("boolean_query", None, chart_id)
 
-        add_longdesc()
-
         _add_key("quicksearch", "quicksearch")
         _add_key("savedsearch", "savedsearch")
         _add_key("savedsearch_sharer_id", "sharer_id")
diff --git a/tests/query.py b/tests/query.py
@@ -144,7 +144,8 @@ def testSubComponent(self):
         'http://example.com', 'bug_file_loc_type': 'foo'}
     _booleans_out = None
     _booleans_chart_out = None
-    _longdesc_out = None
+    _longdesc_out = {'longdesc': 'foobar', 'longdesc_type': 'allwordssubstr',
+        'query_format': 'advanced'}
     _quicksearch_out = None
     _savedsearch_out = None
     _sub_component_out = None
@@ -193,6 +194,8 @@ class BZ4Test(BZ34Test):
     _keywords_out = BZ34Test._keywords_out.copy()
     _keywords_out["include_fields"] = _default_includes
 
+    _longdesc_out = BZ34Test._longdesc_out.copy()
+    _longdesc_out["include_fields"] = _default_includes
 
 
 class RHBZTest(BZ4Test):
@@ -228,9 +231,6 @@ class RHBZTest(BZ4Test):
         'type0-1-0': 'notsubstring', 'value0-1-0': 'OtherQA',
         'include_fields': BZ4Test._default_includes,
         'query_format': 'advanced'}
-    _longdesc_out = {'include_fields': BZ4Test._default_includes,
-        'longdesc': 'foobar', 'longdesc_type': 'allwordssubstr',
-        'query_format': 'advanced'}
     _quicksearch_out = {'include_fields': BZ4Test._default_includes,
         'quicksearch': 'foo bar baz'}
     _savedsearch_out = {'include_fields': BZ4Test._default_includes,
