Skip to content

Commit 1ce3191

Browse files
committed
Fixed the exception twisted.web._newclient.RequestGenerationFailed
Added @defer.inlineCallbacks before def is_wrong_issue to make twisted happy.
1 parent 9e1f5a8 commit 1ce3191

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

zorg/buildbot/reporters/utils.py

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ def _extract_issue(self, props): # override
304304
log.msg(f"{self.name}._extract_issue: INFO: issue={issue}")
305305
return issue
306306

307+
@defer.inlineCallbacks
307308
def is_wrong_issue(self, repo_user, repo_name, sha, issue):
308309
# Users could reference wrong PRs in commit messages.
309310
# So, to make sure we are commenting the correct one we need to check
@@ -316,6 +317,7 @@ def is_wrong_issue(self, repo_user, repo_name, sha, issue):
316317
log.msg(
317318
f"{self.name}.is_wrong_issue: WARNING: Skipped adding the comment for repo {repo_name}, issue is not specified."
318319
)
320+
yield
319321
return wrong_issue
320322

321323
page = 1
@@ -371,7 +373,8 @@ def createStatus(
371373
issue=None,
372374
description=None,
373375
): # override
374-
if self.is_wrong_issue(repo_user, repo_name, sha, issue):
376+
wrong_issue = yield self.is_wrong_issue(repo_user, repo_name, sha, issue)
377+
if wrong_issue:
375378
return None
376379

377380
# This is the right issue to comment.
@@ -383,10 +386,9 @@ def createStatus(
383386

384387
# Use utils.LLVMFailGitHubReporter(debug=True, ...) to simulate the process.
385388
if self.debug:
386-
yield
387-
ret = None
388-
else:
389-
ret = yield self._http.post(url, json=payload)
389+
return None
390+
391+
ret = yield self._http.post(url, json=payload)
390392
return ret
391393

392394

@@ -431,7 +433,8 @@ def createStatus(
431433
issue=None,
432434
description=None,
433435
): # override
434-
if self.is_wrong_issue(repo_user, repo_name, sha, issue):
436+
wrong_issue = yield self.is_wrong_issue(repo_user, repo_name, sha, issue)
437+
if wrong_issue:
435438
return None
436439

437440
# This is the right issue to label.
@@ -448,8 +451,7 @@ def createStatus(
448451

449452
# Use utils.LLVMFailGitHubLabeler(debug=True, ... ) to simulate the process.
450453
if self.debug:
451-
yield
452-
ret = None
453-
else:
454-
ret = yield self._http.post(url, json=payload)
454+
return None
455+
456+
ret = yield self._http.post(url, json=payload)
455457
return ret

0 commit comments

Comments
 (0)