greenwave

Clone

#125 Return results and waivers with greenwave decision.
Merged 6 years ago by gnaponie. Opened 6 years ago by ralph.
verbose-flag  into  master

file modified
+44 
@@ -202,6 +202,50 @@ 
 

      assert res_data['summary'] == expected_summary
 

  

  

+ def test_make_a_decison_with_verbose_flag(requests_session, greenwave_server, testdatabuilder):
 

+     nvr = testdatabuilder.unique_nvr()
 

+     for testcase_name in all_rpmdiff_testcase_names:
 

+         testdatabuilder.create_result(item=nvr,
 

+                                       testcase_name=testcase_name,
 

+                                       outcome='PASSED')
 

+     data = {
 

+         'decision_context': 'errata_newfile_to_qe',
 

+         'product_version': 'rhel-7',
 

+         'subject': [{'item': nvr, 'type': 'koji_build'}],
 

+         'verbose': True,
 

+     }
 

+ 

+     r = requests_session.post(greenwave_server.url + 'api/v1.0/decision',
 

+                               headers={'Content-Type': 'application/json'},
 

+                               data=json.dumps(data))
 

+     assert r.status_code == 200
 

+     res_data = r.json()
 

+     expected_result = {
 

+         u'data': {
 

+             u'item': [u'glibc-1.0-2.el7'],
 

+             u'type': [u'koji_build']
 

+         },
 

+         u'groups': [],
 

+         u'href': u'http://localhost:5001/api/v2.0/results/72',
 

+         u'id': 72,
 

+         u'note': None,
 

+         u'outcome': u'PASSED',
 

+         u'ref_url': None,
 

+         #u'submit_time': u'2018-01-28T12:55:54.641139',

You could just remove this commented out line.

 
+         u'testcase': {
 

+             u'href': u'http://localhost:5001/api/v2.0/testcases/dist.rpmdiff.analysis.abi_symbols',
 

+             u'name': u'dist.rpmdiff.analysis.abi_symbols',
 

+             u'ref_url': None,
 

+         }
 

+     }
 

+ 

+     assert len(res_data['results']) == len(all_rpmdiff_testcase_names)
 

+     del res_data['results'][-1]['submit_time']
 

+     assert res_data['results'][-1] == expected_result
 

+     expected_waivers = []
 

+     assert res_data['waivers'] == expected_waivers
 

+ 

+ 

  def test_make_a_decison_on_failed_result_with_waiver(
 

          requests_session, greenwave_server, testdatabuilder):
 

      nvr = testdatabuilder.unique_nvr()

file modified
+52 -2 
@@ -122,7 +122,8 @@ 
 

         {
 

             "decision_context": "bodhi_update_push_stable",
 

             "product_version": "fedora-26",
 

-            "subject": [{"item": "glibc-1.0-1.f26", "type": "koji_build"}]
 

+            "subject": [{"item": "glibc-1.0-1.f26", "type": "koji_build"}],
 

+            "verbose": True
 

         }
 

  

  
@@ -153,7 +154,42 @@ 
 

                     'testcase': 'dist.rpmlint',
 

                     'type': 'test-result-missing'
 

                 }
 

-            ]
 

+            ],
 

+            "results": [
 

+                {
 

+                  'data': {
 

+                    'arch': [ 'i386' ],
 

+                    'item': [ 'cross-gcc-7.0.1-0.3.fc26' ],
 

+                    'scenario': [ 'i386' ],
 

+                    'type': [ 'koji_build' ]
 

+                  },
 

+                  'groups': [ '05078932-67a1-11e7-b290-5254008e42f6' ],
 

+                  'href': 'https://taskotron.fedoraproject.org/resultsdb_api/api/v2.0/results/123',
 

+                  'id': 123,
 

+                  'note': null,
 

+                  'outcome': 'FAILED',
 

+                  'ref_url': 'https://taskotron.fedoraproject.org/artifacts/all/05078932-67a1-11e7-b290-5254008e42f6/task_output/cross-gcc-7.0.1-0.3.fc26.i386.log',
 

+                  'submit_time': '2017-07-13T08:15:14.474984',
 

+                  'testcase': {
 

+                    'href': 'https://taskotron.fedoraproject.org/resultsdb_api/api/v2.0/testcases/dist.depcheck',
 

+                    'name': 'dist.depcheck',
 

+                    'ref_url': 'https://fedoraproject.org/wiki/Taskotron/Tasks/depcheck'
 

+                  }
 

+                }
 

+            ],
 

+            "waivers": [
 

+                {
 

+                  'username': 'ralph',
 

+                  'comment': 'This is fine.',
 

+                  'product_version': 'fedora-27',
 

+                  'waived': true,
 

+                  'timestamp': '2018-01-23T18:02:04.630122',
 

+                  'proxied_by': null,
 

+                  'subject': [{'item': 'cross-gcc-7.0.1-0.3.fc26', 'type': 'koji_build'}],
 

+                  'testcase': 'dist.rpmlint',
 

+                  'id': 1
 

+                }
 

+            ],
 

         }
 

  

      :jsonparam string product_version: The product version string used for querying WaiverDB.
 
@@ -163,6 +199,7 @@ 
 

      :jsonparam list subject: A list of items about which the caller is requesting a decision
 

          used for querying ResultsDB. Each item contains one or more key-value pairs of 'data' key
 

          in ResultsDB API. For example, [{"type": "koji_build", "item": "xscreensaver-5.37-3.fc27"}].
 

+     :jsonparam bool verbose: A flag to return additional information.
 

      :jsonparam list ignore_result: A list of result ids that will be ignored when making
 

          the decision.
 

      :jsonparam list ignore_waiver: A list of waiver ids that will be ignored when making
 
@@ -187,6 +224,9 @@ 
 

          raise BadRequest('Invalid subject, must be a list of items')
 

      product_version = data['product_version']
 

      decision_context = data['decision_context']
 

+     verbose = data.get('verbose', False)
 

+     if not isinstance(verbose, bool):
 

+         raise BadRequest('Invalid verbose flag, must be a bool')
 

      ignore_results = data.get('ignore_result', [])
 

      ignore_waivers = data.get('ignore_waiver', [])
 

      applicable_policies = [policy for policy in current_app.config['policies']
 
@@ -200,14 +240,19 @@ 
 

          raise BadRequest('Invalid subject, must be a list of dicts')
 

      answers = []
 

  

+     all_results, all_waivers = [], []
 

      for item in subjects:
 

          results = retrieve_results(item)
 

          results = [r for r in results if r['id'] not in ignore_results]
 

+         all_results.extend(results)
 

  

          waivers = retrieve_waivers(product_version, item)
 

          waivers = [w for w in waivers if w['id'] not in ignore_waivers]
 

+         all_waivers.extend(waivers)
 

+ 

          for policy in applicable_policies:
 

              answers.extend(policy.check(item, results, waivers))
 

+ 

      res = {
 

          'policies_satisfied': all(answer.is_satisfied for answer in answers),
 

          'summary': summarize_answers(answers),
 
@@ -215,6 +260,11 @@ 
 

          'unsatisfied_requirements': [answer.to_json() for answer in answers
 

                                       if not answer.is_satisfied],
 

      }
 

+     if verbose:
 

+         res.update({
 

+             'results': all_results,
 

+             'waivers': all_waivers,
 

+         })
 

      resp = jsonify(res)
 

      resp = insert_headers(resp)
 

      resp.status_code = 200

This change adds a verbose flag (defaulting to false) that returns all of the
results and waivers associated with the subject of a decision (including the
extraneous ones which are not referenced by any policies).

Fixes #124.

You forgot the comma ","

boo! :-1:

rebased onto e323da739eeaba72a5dccf860f507d155db26d64
6 years ago

also here a comma "," is missing

Rebased to address your comments @gnaponie. Can you give it another look?

rebased onto d95ff9e
6 years ago

You could just remove this commented out line.

+1

Looks good to me

Pull-Request has been merged by gnaponie
6 years ago
Metadata
None
No Tags
Changes Summary 2
+44 -0
file changed
functional-tests/test_api_v1.py
+52 -2
file changed
greenwave/api_v1.py
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.