WPT Export: trim lines from branch list, stage changes before committing

third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py
index e3f6b73a8967e2d1c37e6a508dec9dc2fd9e638c..3c764e7359cc87cbdc601946ac6642b8820f00b2 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_github.py
@@ -99,8 +99,8 @@ class WPTGitHub(object):
         path = '/repos/w3c/web-platform-tests/git/refs/heads/%s' % remote_branch_name
         data, status_code = self.request(path, method='DELETE')
 
-        if status_code != 200:
+        if status_code != 204:
             # TODO(jeffcarp): Raise more specific exception (create MergeError class?)
-            raise Exception('PR could not be merged')
+            raise Exception('Received non-204 status code attempting to delete remote branch: {}'.format(status_code))
 
         return data

[qyearsley, 2017/01/24 18:30:56]

Note, this could probably be unit-tested by making a unit test method that
overrides WPTGithub.request with a method returning a canned response, but the
benefit of such a test method is pretty small in this case.

[jeffcarp, 2017/01/25 19:40:00]

I'll add a TODO.