Commit d0012b82 authored by Stephen McGruer's avatar Stephen McGruer Committed by Commit Bot

Do not delete branches from the WPT exporter

GitHub now deletes branches automatically when a PR is merged. As such,
the exporter should no longer try to delete them.

Bug: 1032079
Change-Id: I404764eec3d9abfccd7f128dcd52897b9ac06a2d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1955337Reviewed-by: default avatarLuke Z <lpz@chromium.org>
Reviewed-by: default avatarRobert Ma <robertma@chromium.org>
Commit-Queue: Robert Ma <robertma@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723474}
parent 20076437
...@@ -214,12 +214,6 @@ class TestExporter(object): ...@@ -214,12 +214,6 @@ class TestExporter(object):
try: try:
self.wpt_github.merge_pr(pull_request.number) self.wpt_github.merge_pr(pull_request.number)
# This is in the try block because if a PR can't be merged, we shouldn't
# delete its branch.
_log.info('Deleting remote branch %s...', branch)
self.wpt_github.delete_remote_branch(branch)
change_id = self.wpt_github.extract_metadata('Change-Id: ', pull_request.body) change_id = self.wpt_github.extract_metadata('Change-Id: ', pull_request.body)
if change_id: if change_id:
cl = GerritCL(data={'change_id': change_id}, api=self.gerrit) cl = GerritCL(data={'change_id': change_id}, api=self.gerrit)
......
...@@ -181,7 +181,6 @@ class TestExporterTest(LoggingTestCase): ...@@ -181,7 +181,6 @@ class TestExporterTest(LoggingTestCase):
# removed it from. # removed it from.
'get_pr_branch', 'get_pr_branch',
'merge_pr', 'merge_pr',
'delete_remote_branch',
# 5. #458479 # 5. #458479
'pr_for_chromium_commit', 'pr_for_chromium_commit',
'get_pr_branch', 'get_pr_branch',
...@@ -348,7 +347,6 @@ class TestExporterTest(LoggingTestCase): ...@@ -348,7 +347,6 @@ class TestExporterTest(LoggingTestCase):
'pr_for_chromium_commit', 'pr_for_chromium_commit',
'get_pr_branch', 'get_pr_branch',
'merge_pr', 'merge_pr',
'delete_remote_branch',
]) ])
self.assertEqual(test_exporter.wpt_github.pull_requests_created, []) self.assertEqual(test_exporter.wpt_github.pull_requests_created, [])
self.assertEqual(test_exporter.wpt_github.pull_requests_merged, [1234]) self.assertEqual(test_exporter.wpt_github.pull_requests_merged, [1234])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment