tests: add full RHBugzilla coverage

crobinso · crobinso · commit e89676b084f1 · 2020-01-10T14:40:13.000-05:00
Signed-off-by: Cole Robinson &lt;crobinso@redhat.com&gt;
diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
@@ -78,25 +78,19 @@ def pre_translation(query):
         """
         old = query.copy()
 
+        def split_comma(_v):
+            if isinstance(_v, list):
+                return _v
+            return _v.split(",")
+
         if 'bug_id' in query:
-            if not isinstance(query['bug_id'], list):
-                query['id'] = query['bug_id'].split(',')
-            else:
-                query['id'] = query['bug_id']
-            del query['bug_id']
+            query['id'] = split_comma(query.pop('bug_id'))
 
         if 'component' in query:
-            if not isinstance(query['component'], list):
-                query['component'] = query['component'].split(',')
-
-        if 'include_fields' not in query and 'column_list' not in query:
-            return
+            query['component'] = split_comma(query['component'])
 
-        if 'include_fields' not in query:
-            query['include_fields'] = []
-            if 'column_list' in query:
-                query['include_fields'] = query['column_list']
-                del query['column_list']
+        if 'include_fields' not in query and 'column_list' in query:
+            query['include_fields'] = query.pop('column_list')
 
         if old != query:
             log.debug("RHBugzilla pretranslated query to: %s", query)
diff --git a/tests/data/clioutput/test_query1-rhbz.txt b/tests/data/clioutput/test_query1-rhbz.txt
@@ -0,0 +1,2 @@
+#508645 NEW        - Libvirt Maintainers - RFE: qemu: Support a managed autoconnect mode for host USB devices
+#668543 NEW        - Cole Robinson - RFE: warn users at guest start if networks/storage pools are inactive
diff --git a/tests/data/mockargs/test_modify4.txt b/tests/data/mockargs/test_modify4.txt
@@ -0,0 +1,4 @@
+{'cf_fixed_in': 'foofixedin',
+ 'component': 'lvm2',
+ 'ids': ['1165434'],
+ 'sub_components': {'lvm2': ['some-sub-component']}}
diff --git a/tests/data/mockargs/test_query1-rhbz.txt b/tests/data/mockargs/test_query1-rhbz.txt
@@ -0,0 +1,4 @@
+{'component': ['foo', 'bar'],
+ 'id': ['1234', '2480'],
+ 'include_fields': ['assigned_to', 'id', 'status', 'summary'],
+ 'product': ['foo']}
diff --git a/tests/test_api_misc.py b/tests/test_api_misc.py
@@ -84,6 +84,24 @@ def _testPostCompare(bz, indict, outexpect):
     _testPostCompare(rhbz, test1, out_simple)
 
 
+def test_rhbz_pre_translation():
+    bz = tests.mockbackend.make_bz(rhbz=True)
+    input_query = {
+        "bug_id": "12345,6789",
+        "component": "comp1,comp2",
+        "column_list": ["field1", "field8"],
+    }
+
+    bz.pre_translation(input_query)
+    output_query = {
+        'component': ['comp1', 'comp2'],
+        'id': ['12345', '6789'],
+        'include_fields': ['field1', 'field8', 'id'],
+    }
+
+    assert output_query == input_query
+
+
 def testSubComponentFail():
     bz = tests.mockbackend.make_bz(version="4.4.0", rhbz=True)
     with pytest.raises(ValueError):
diff --git a/tests/test_cli_modify.py b/tests/test_cli_modify.py
@@ -38,7 +38,7 @@ def test_modify(run_cli):
     out = run_cli(cmd, fakebz)
     assert not out
 
-    # Modify with tricky opts
+    # Modify with tricky opts hitting other API calls
     cmd = "bugzilla modify 1165434 "
     cmd += "--tags +addtag --tags=-rmtag "
     cmd += "--qa_whiteboard +yo-qa --qa_whiteboard=-foo "
@@ -53,3 +53,14 @@ def test_modify(run_cli):
         bug_get_return="data/mockreturn/test_getbug_rhel.txt")
     out = run_cli(cmd, fakebz)
     assert not out
+
+    # Modify hitting some rhbz paths
+    cmd = "bugzilla modify 1165434 "
+    cmd += "--fixed_in foofixedin "
+    cmd += "--component lvm2 "
+    cmd += "--sub-component some-sub-component"
+    fakebz = tests.mockbackend.make_bz(rhbz=True,
+        bug_update_args="data/mockargs/test_modify4.txt",
+        bug_update_return={})
+    out = run_cli(cmd, fakebz)
+    assert not out
diff --git a/tests/test_cli_query.py b/tests/test_cli_query.py
@@ -34,6 +34,15 @@ def test_query(run_cli):
     out = run_cli(cmd, fakebz)
     tests.utils.diff_compare(out, "data/clioutput/test_query1.txt")
 
+    # Simple query with some comma opts
+    cmd = "bugzilla query "
+    cmd += "--product foo --component foo,bar --bug_id 1234,2480"
+    fakebz = tests.mockbackend.make_bz(rhbz=True,
+        bug_search_args="data/mockargs/test_query1-rhbz.txt",
+        bug_search_return="data/mockreturn/test_query1.txt")
+    out = run_cli(cmd, fakebz)
+    tests.utils.diff_compare(out, "data/clioutput/test_query1-rhbz.txt")
+
     # Same but with --ids output
     cmd = "bugzilla query --ids "
     cmd += "--product foo --component foo,bar --bug_id 1234,2480"

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#508645 NEW - Libvirt Maintainers - RFE: qemu: Support a managed autoconnect mode for host USB devices`
	`2`	`+#668543 NEW - Cole Robinson - RFE: warn users at guest start if networks/storage pools are inactive`