[WPT Export] Delete remote branch, add label, additional refactoring

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

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import unittest
 
 from webkitpy.common.host_mock import MockHost
 from webkitpy.common.system.executive_mock import MockExecutive
 from webkitpy.w3c.chromium_commit import ChromiumCommit
 from webkitpy.w3c.test_exporter import TestExporter
@@ skipping 81 matching lines @@
             'footers': 'cr-rev-position',
         })
         test_exporter = TestExporter(self.host, self.wpt_github)
 
         commits = test_exporter.exportable_commits_since('beefcafe')
         self.assertEqual(len(commits), 1)
         self.assertIsInstance(commits[0], ChromiumCommit)
         self.assertEqual(self.host.executive.calls, [
             ['git', 'clone', 'https://chromium.googlesource.com/external/w3c/web-platform-tests.git', '/tmp/wpt'],
             ['git', 'rev-parse', '--show-toplevel'],
-            ['git', 'rev-list', 'beefcafe..HEAD', '--reverse', '--',
-             'badbeef8/third_party/WebKit/LayoutTests/imported/wpt/'],
-            ['git', 'diff-tree', '--name-only', '--no-commit-id', '-r',
-             'badbeef8', '--', '/mock-checkout/third_party/WebKit/LayoutTests/imported/wpt'],
+            ['git', 'rev-list', 'beefcafe..HEAD', '--reverse', '--', 'badbeef8/third_party/WebKit/LayoutTests/imported/wpt/'],
+            ['git', 'diff-tree', '--name-only', '--no-commit-id', '-r', 'badbeef8', '--',
+             '/mock-checkout/third_party/WebKit/LayoutTests/imported/wpt'],
             ['git', 'format-patch', '-1', '--stdout', 'badbeef8', '--', 'some', 'files'],
             ['git', 'reset', '--hard', 'HEAD'],
             ['git', 'clean', '-fdx'],
             ['git', 'checkout', 'origin/master'],
+            ['git', 'branch', '-a'],
             ['git', 'apply', '-'],
             ['git', 'add', '.'],
             ['git', 'diff', 'origin/master'],
             ['git', 'reset', '--hard', 'HEAD'],
             ['git', 'clean', '-fdx'],
             ['git', 'checkout', 'origin/master'],
+            ['git', 'branch', '-a'],
             ['git', 'show', '--format=%B', '--no-patch', 'badbeef8'],
             ['git', 'show', '--format=%B', '--no-patch', 'badbeef8']])
 
     def test_ignores_commits_with_noexport_true(self):
         self.host.executive = mock_command_exec({
             'show': 'Commit message\nNOEXPORT=true',
             'rev-list': 'badbeef8',
             'rev-parse': 'badbeef8',
             'footers': 'cr-rev-position',
         })
@@ skipping 41 matching lines @@
 
         commits = test_exporter.exportable_commits_since('beefcafe')
         self.assertEqual(len(commits), 0)
         self.assertEqual(self.host.executive.calls, [
             ['git', 'clone', 'https://chromium.googlesource.com/external/w3c/web-platform-tests.git', '/tmp/wpt'],
             ['git', 'rev-parse', '--show-toplevel'],
             ['git', 'rev-list', 'beefcafe..HEAD', '--reverse', '--',
              'badbeef8/third_party/WebKit/LayoutTests/imported/wpt/'],
             ['git', 'diff-tree', '--name-only', '--no-commit-id', '-r', 'badbeef8', '--',
              '/mock-checkout/third_party/WebKit/LayoutTests/imported/wpt']])