diff options
author | James E. Blair <jim@acmegating.com> | 2022-09-06 15:04:09 -0700 |
---|---|---|
committer | James E. Blair <jim@acmegating.com> | 2022-09-06 15:04:09 -0700 |
commit | ccb00d6827cccccb86ad5dbd55b226f13aed30fc (patch) | |
tree | 681753055e21f20cda2f21453fb428e26191d795 /tests | |
parent | 0b4c6b011701f8723cb722a739d2ce24d6ad4376 (diff) | |
download | zuul-ccb00d6827cccccb86ad5dbd55b226f13aed30fc.tar.gz |
Log more info on gerrit 403 errors
If Gerrit returns a 403 on submit, log the text we get in reply to
help diagnose the problem.
Change-Id: I8c9b286bb63ba1703a6a8f3cd6cd9a4b86e62cf2
Diffstat (limited to 'tests')
-rw-r--r-- | tests/base.py | 10 | ||||
-rw-r--r-- | tests/unit/test_gerrit.py | 19 |
2 files changed, 29 insertions, 0 deletions
diff --git a/tests/base.py b/tests/base.py index cebcf2e1f..cf6296f62 100644 --- a/tests/base.py +++ b/tests/base.py @@ -1031,6 +1031,11 @@ class GerritWebServer(object): self.send_response(500) self.end_headers() + def _403(self, msg): + self.send_response(403) + self.end_headers() + self.wfile.write(msg.encode('utf8')) + def _404(self): self.send_response(404) self.end_headers() @@ -1073,6 +1078,9 @@ class GerritWebServer(object): if not change: return self._404() + if not fake_gerrit._fake_submit_permission: + return self._403('submit not permitted') + candidate = self._get_change(change_id) sr = candidate.getSubmitRecords() if sr[0]['status'] != 'OK': @@ -1306,6 +1314,8 @@ class FakeGerritConnection(gerritconnection.GerritConnection): self._poller_event = poller_event self._ref_watcher_event = ref_watcher_event self._fake_submit_whole_topic = False + self._fake_submit_permission = True + self.submit_retry_backoff = 0 def onStop(self): super().onStop() diff --git a/tests/unit/test_gerrit.py b/tests/unit/test_gerrit.py index 47545b9be..e98cb80b5 100644 --- a/tests/unit/test_gerrit.py +++ b/tests/unit/test_gerrit.py @@ -359,6 +359,25 @@ class TestGerritWeb(ZuulTestCase): changes="1,1 2,1 3,1"), ], ordered=False) + def test_submit_failure(self): + # Test that we log the reason for a submit failure (403 error) + self.fake_gerrit._fake_submit_permission = False + A = self.fake_gerrit.addFakeChange('org/project1', "master", "A") + A.addApproval('Code-Review', 2) + with self.assertLogs('zuul.test.FakeGerritConnection', level='INFO' + ) as full_logs: + self.fake_gerrit.addEvent(A.addApproval('Approved', 1)) + self.waitUntilSettled() + self.log.debug("Full logs:") + for x in full_logs.output: + self.log.debug(x) + self.assertRegexInList( + r'Error submitting data to gerrit on attempt 3: ' + 'Received response 403: submit not permitted', + full_logs.output) + + self.assertEqual(A.data['status'], 'NEW') + class TestFileComments(AnsibleZuulTestCase): config_file = 'zuul-gerrit-web.conf' |