From cc0ab7b5332d716815fd3afe6de1a1ab6c4a7dd1 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Fri, 20 Nov 2026 17:06:32 +0000 Subject: [PATCH 1/2] Wait for the HTTP response in the PR reporter --- .github/workflows/check.yml | 2 ++ master/custom/pr_reporter.py | 3 ++- tests/test_pr_reporter.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 tests/test_pr_reporter.py diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index bf07b26d..54958922 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -26,6 +26,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Check configuration run: make check PIP=pip BUILDBOT=buildbot PYTHON_VERSION=${{ matrix.python-version }} + - name: Check custom components + run: PYTHONPATH=master python -m unittest discover -s tests - name: Compare configuration reports run: | # Use the same formatter for both configurations, including older main revisions. diff --git a/master/custom/pr_reporter.py b/master/custom/pr_reporter.py index dfcdfdaa..4bce0999 100644 --- a/master/custom/pr_reporter.py +++ b/master/custom/pr_reporter.py @@ -231,8 +231,9 @@ def createStatus( payload = {"body": message} headers = yield self._get_auth_header(props) - return self._http.post( + response = yield self._http.post( "/".join(["/repos", repo_user, repo_name, "issues", issue, "comments"]), json=payload, headers=headers, ) + return response diff --git a/tests/test_pr_reporter.py b/tests/test_pr_reporter.py new file mode 100644 index 00000000..1fcb7a41 --- /dev/null +++ b/tests/test_pr_reporter.py @@ -0,0 +1,30 @@ +import unittest +from unittest import mock + +from twisted.internet import defer +from twisted.trial import unittest as trial + +from custom.pr_reporter import GitHubPullRequestReporter + + +class PullRequestReporterTests(trial.TestCase): + def test_create_status_waits_for_http_response(self): + reporter = GitHubPullRequestReporter('example-token') + reporter._getURLForBuild = mock.Mock(return_value='https://example.org/build') + reporter._get_auth_header = mock.Mock(return_value=defer.succeed({})) + pending = defer.Deferred() + reporter._http = mock.Mock() + reporter._http.post.return_value = pending + result = reporter.createStatus( + build={'builder': {'name': 'builder', 'builderid': 1, 'tags': []}, 'number': 2}, + repo_user='python', repo_name='cpython', sha='abc', state='failure', + props=mock.Mock(), issue='123', tracebacks=[], logs=mock.Mock(), + ) + self.assertNoResult(result) + response = mock.Mock(code=201) + pending.callback(response) + self.assertIs(self.successResultOf(result), response) + + +if __name__ == '__main__': + unittest.main() From 95d0d2f69af381cd1e3af75fcb926af82f2003c1 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Salgado Date: Fri, 20 Nov 2026 18:27:00 +0000 Subject: [PATCH 2/2] Keep the PR reporter change focused on the HTTP response --- .github/workflows/check.yml | 2 -- tests/test_pr_reporter.py | 30 ------------------------------ 2 files changed, 32 deletions(-) delete mode 100644 tests/test_pr_reporter.py diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 54958922..bf07b26d 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -26,8 +26,6 @@ jobs: python-version: ${{ matrix.python-version }} - name: Check configuration run: make check PIP=pip BUILDBOT=buildbot PYTHON_VERSION=${{ matrix.python-version }} - - name: Check custom components - run: PYTHONPATH=master python -m unittest discover -s tests - name: Compare configuration reports run: | # Use the same formatter for both configurations, including older main revisions. diff --git a/tests/test_pr_reporter.py b/tests/test_pr_reporter.py deleted file mode 100644 index 1fcb7a41..00000000 --- a/tests/test_pr_reporter.py +++ /dev/null @@ -1,30 +0,0 @@ -import unittest -from unittest import mock - -from twisted.internet import defer -from twisted.trial import unittest as trial - -from custom.pr_reporter import GitHubPullRequestReporter - - -class PullRequestReporterTests(trial.TestCase): - def test_create_status_waits_for_http_response(self): - reporter = GitHubPullRequestReporter('example-token') - reporter._getURLForBuild = mock.Mock(return_value='https://example.org/build') - reporter._get_auth_header = mock.Mock(return_value=defer.succeed({})) - pending = defer.Deferred() - reporter._http = mock.Mock() - reporter._http.post.return_value = pending - result = reporter.createStatus( - build={'builder': {'name': 'builder', 'builderid': 1, 'tags': []}, 'number': 2}, - repo_user='python', repo_name='cpython', sha='abc', state='failure', - props=mock.Mock(), issue='123', tracebacks=[], logs=mock.Mock(), - ) - self.assertNoResult(result) - response = mock.Mock(code=201) - pending.callback(response) - self.assertIs(self.successResultOf(result), response) - - -if __name__ == '__main__': - unittest.main()