Use chromium revision instead of blink svn revision when rebaselining layout tests.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #    * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #    * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 872 matching lines @@
 
     def test_missing_baselines(self):
         self.command.execute(MockOptions(suffixes='png,txt', missing=True, platform=None), ['passes/text.html'], self.tool)
         self.assertEqual(self.lines,
             ['passes/text-expected.png: (no baselines found)',
              'passes/text-expected.txt:',
              '  (generic): 123456'])
 
 
 class TestAutoRebaseline(_BaseTestCase):
-    SVN_REMOTE_CMD = ['git', 'config', '--local', '--get-regexp', '^svn-remote\\.']
     command_constructor = AutoRebaseline
 
     def _write_test_file(self, port, path, contents):
         abs_path = self.tool.filesystem.join(port.layout_tests_dir(), path)
         self.tool.filesystem.write_text_file(abs_path, contents)
 
     def _setup_test_port(self):
         test_port = self.tool.port_factory.get('test')
         original_get = self.tool.port_factory.get
 
@@ skipping 34 matching lines @@
 6469e754a1 path/to/TestExpectations                   (foobarbaz1@chromium.org 2013-04-28 04:52:41 +0000   12) crbug.com/24182 path/to/rebaseline-new-revision.html [ NeedsRebaseline ]
 624caaaaaa path/to/TestExpectations                   (foo@chromium.org        2013-04-28 04:52:41 +0000   12) crbug.com/24182 path/to/not-cycled-through-bots.html [ NeedsRebaseline ]
 0000000000 path/to/TestExpectations                   (foo@chromium.org        2013-04-28 04:52:41 +0000   12) crbug.com/24182 path/to/locally-changed-lined.html [ NeedsRebaseline ]
 """
         self.tool.scm().blame = blame
 
         min_revision = 9000
         self.assertEqual(self.command.tests_to_rebaseline(self.tool, min_revision, print_revisions=False), (
                 set(['path/to/rebaseline-without-bug-number.html', 'path/to/rebaseline-with-modifiers.html', 'path/to/rebaseline-without-modifiers.html']),
                 5678,
+                '624c3081c0',
                 'foobarbaz1@chromium.org',
                 set(['24182', '234']),
                 True))
 
     def test_tests_to_rebaseline_over_limit(self):
         def blame(path):
             result = ""
             for i in range(0, self.command.MAX_LINES_TO_REBASELINE + 1):
                 result += "624c3081c0 path/to/TestExpectations                   (foobarbaz1@chromium.org 2013-04-28 04:52:41 +0000   13) crbug.com/24182 path/to/rebaseline-%s.html [ NeedsRebaseline ]\n" % i
             return result
         self.tool.scm().blame = blame
 
         expected_list_of_tests = []
         for i in range(0, self.command.MAX_LINES_TO_REBASELINE):
             expected_list_of_tests.append("path/to/rebaseline-%s.html" % i)
 
         min_revision = 9000
         self.assertEqual(self.command.tests_to_rebaseline(self.tool, min_revision, print_revisions=False), (
                 set(expected_list_of_tests),
                 5678,
+                '624c3081c0',
                 'foobarbaz1@chromium.org',
                 set(['24182']),
                 True))
 
     def test_commit_message(self):
         author = "foo@chromium.org"
         revision = 1234
+        commit = "abcd567"
         bugs = set()
-        self.assertEqual(self.command.commit_message(author, revision, bugs),
+        self.assertEqual(self.command.commit_message(author, revision, commit, bugs),
             """Auto-rebaseline for r1234
 
-http://src.chromium.org/viewvc/blink?view=revision&revision=1234
+https://chromium.googlesource.com/chromium/src/+/abcd567
 
 TBR=foo@chromium.org
 """)
 
         bugs = set(["234", "345"])
-        self.assertEqual(self.command.commit_message(author, revision, bugs),
+        self.assertEqual(self.command.commit_message(author, revision, commit, bugs),
             """Auto-rebaseline for r1234
 
-http://src.chromium.org/viewvc/blink?view=revision&revision=1234
+https://chromium.googlesource.com/chromium/src/+/abcd567
 
 BUG=234,345
 TBR=foo@chromium.org
 """)
 
     def test_no_needs_rebaseline_lines(self):
         def blame(path):
             return """
 6469e754a1 path/to/TestExpectations                   (foobarbaz1@chromium.org 2013-06-14 20:18:46 +0000   11) crbug.com/24182 [ Debug ] path/to/norebaseline.html [ ImageOnlyFailure ]
 """
@@ skipping 54 matching lines @@
 crbug.com/24182 [ SnowLeopard ] fast/dom/prototype-strawberry.html [ NeedsRebaseline ]
 crbug.com/24182 fast/dom/prototype-chocolate.html [ NeedsRebaseline ]
 crbug.com/24182 path/to/not-cycled-through-bots.html [ NeedsRebaseline ]
 crbug.com/24182 path/to/locally-changed-lined.html [ NeedsRebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
         self._write_test_file(test_port, 'fast/dom/prototype-strawberry.html', "Dummy test contents")
         self._write_test_file(test_port, 'fast/dom/prototype-chocolate.html', "Dummy test contents")
 
-        self.tool.executive = MockLineRemovingExecutive(
-            should_return_zero_when_run=set(self.SVN_REMOTE_CMD))
+        self.tool.executive = MockLineRemovingExecutive()
 
         old_exact_matches = builders._exact_matches
         try:
             builders._exact_matches = {
                 "MOCK Leopard": {"port_name": "test-mac-leopard", "specifiers": set(["mock-specifier"])},
                 "MOCK SnowLeopard": {"port_name": "test-mac-snowleopard", "specifiers": set(["mock-specifier"])},
             }
 
             self.command.tree_status = lambda: 'closed'
             self.command.execute(MockOptions(optimize=True, verbose=False, results_directory=False), [], self.tool)
             self.assertEqual(self.tool.executive.calls, [])
 
             self.command.tree_status = lambda: 'open'
             self.tool.executive.calls = []
             self.command.execute(MockOptions(optimize=True, verbose=False, results_directory=False), [], self.tool)
 
             self.assertEqual(self.tool.executive.calls, [
-                self.SVN_REMOTE_CMD,
                 [
                     ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt,png', '--builder', 'MOCK Leopard', '--test', 'fast/dom/prototype-chocolate.html'],
                     ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'png', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-strawberry.html'],
                     ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt', '--builder', 'MOCK Leopard', '--test', 'fast/dom/prototype-taco.html'],
                     ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-taco.html'],
                 ],
                 [
                     ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt,png', '--builder', 'MOCK Leopard', '--test', 'fast/dom/prototype-chocolate.html'],
                     ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'png', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-strawberry.html'],
                     ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt', '--builder', 'MOCK Leopard', '--test', 'fast/dom/prototype-taco.html'],
                     ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-taco.html'],
                 ],
                 [
                     ['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', 'txt,png', 'fast/dom/prototype-chocolate.html'],
                     ['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', 'png', 'fast/dom/prototype-strawberry.html'],
                     ['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', 'txt', 'fast/dom/prototype-taco.html'],
                 ],
                 ['git', 'cl', 'upload', '-f'],
                 ['git', 'pull'],
                 ['git', 'cl', 'dcommit', '-f'],
                 ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
-                ['git', 'cl', 'set_close'],
             ])
 
             # The mac ports should both be removed since they're the only ones in builders._exact_matches.
             self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
 crbug.com/24182 [ Debug ] path/to/norebaseline.html [ Rebaseline ]
 Bug(foo) [ Linux Win ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
 crbug.com/24182 [ Linux Win ] fast/dom/prototype-chocolate.html [ NeedsRebaseline ]
 crbug.com/24182 path/to/not-cycled-through-bots.html [ NeedsRebaseline ]
 crbug.com/24182 path/to/locally-changed-lined.html [ NeedsRebaseline ]
 """)
@@ skipping 38 matching lines @@
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
         old_exact_matches = builders._exact_matches
         try:
             builders._exact_matches = {
                 "MOCK SnowLeopard": {"port_name": "test-mac-snowleopard", "specifiers": set(["mock-specifier"])},
             }
 
             self.command.SECONDS_BEFORE_GIVING_UP = 0
             self.command.tree_status = lambda: 'open'
-            self.tool.executive = MockExecutive(
-                should_return_zero_when_run=set(self.SVN_REMOTE_CMD))
+            self.tool.executive = MockExecutive()
             self.tool.executive.calls = []
             self.command.execute(MockOptions(optimize=True, verbose=False, results_directory=False), [], self.tool)
 
             self.assertEqual(self.tool.executive.calls, [
-                self.SVN_REMOTE_CMD,
                 [
                     ['python', 'echo', 'copy-existing-baselines-internal', '--suffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-taco.html'],
                 ],
                 [
                     ['python', 'echo', 'rebaseline-test-internal', '--suffixes', 'txt', '--builder', 'MOCK SnowLeopard', '--test', 'fast/dom/prototype-taco.html'],
                 ],
                 [['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', 'txt', 'fast/dom/prototype-taco.html']],
                 ['git', 'cl', 'upload', '-f'],
             ])
         finally:
@@ skipping 27 matching lines @@
             return self.command._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
-        self.tool.executive = MockLineRemovingExecutive(
-            should_return_zero_when_run=set(self.SVN_REMOTE_CMD))
+        self.tool.executive = MockLineRemovingExecutive()
 
         old_exact_matches = builders._exact_matches
         try:
             builders._exact_matches = {
                 "MOCK Leopard": {"port_name": "test-mac-leopard", "specifiers": set(["mock-specifier"])},
                 "MOCK SnowLeopard": {"port_name": "test-mac-snowleopard", "specifiers": set(["mock-specifier"])},
             }
 
             self.command.tree_status = lambda: 'open'
             self.command.execute(MockOptions(optimize=True, verbose=False, results_directory=False), [], self.tool)
             self.assertEqual(self.tool.executive.calls, [
-                self.SVN_REMOTE_CMD,
                 [['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', '', 'fast/dom/prototype-taco.html']],
                 ['git', 'cl', 'upload', '-f'],
                 ['git', 'pull'],
                 ['git', 'cl', 'dcommit', '-f'],
                 ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
-                ['git', 'cl', 'set_close'],
             ])
 
             # The mac ports should both be removed since they're the only ones in builders._exact_matches.
             self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
 Bug(foo) [ Linux Win ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
         finally:
             builders._exact_matches = old_exact_matches
 
-    def test_execute_setup_git_svn(self):
-        def blame(path):
-            return """
-6469e754a1 path/to/TestExpectations                   (foobarbaz1@chromium.org 2013-04-28 04:52:41 +0000   13) Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
-"""
-        self.tool.scm().blame = blame
-
-        test_port = self._setup_test_port()
-
-        old_builder_data = self.command.builder_data
-
-        def builder_data():
-            self.command._builder_data['MOCK Win'] = LayoutTestResults.results_from_string("""ADD_RESULTS({
-    "tests": {
-        "fast": {
-            "dom": {
-                "prototype-taco.html": {
-                    "expected": "FAIL",
-                    "actual": "PASS",
-                    "is_unexpected": true
-                }
-            }
-        }
-    }
-});""")
-            return self.command._builder_data
-
-        self.command.builder_data = builder_data
-
-        self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
-Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
-""")
-
-        self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
-
-        self.tool.executive = MockLineRemovingExecutive()
-
-        old_exact_matches = builders._exact_matches
-        try:
-            builders._exact_matches = {
-                "MOCK Win": {"port_name": "test-win-win7", "specifiers": set(["mock-specifier"])},
-            }
-
-            self.command.tree_status = lambda: 'open'
-            self.command.execute(MockOptions(optimize=True, verbose=False, results_directory=False), [], self.tool)
-            self.assertEqual(self.tool.executive.calls, [
-                self.SVN_REMOTE_CMD,
-                ['git', 'auto-svn'],
-                [['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', '', 'fast/dom/prototype-taco.html']],
-                ['git', 'cl', 'upload', '-f'],
-                ['git', 'pull'],
-                ['git', 'cl', 'dcommit', '-f'],
-                ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
-            ])
-
-            self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
-Bug(foo) [ Linux Mac XP ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
-""")
-        finally:
-            builders._exact_matches = old_exact_matches
-
     def test_execute_use_alternate_rebaseline_branch(self):
         def blame(path):
             return """
 6469e754a1 path/to/TestExpectations                   (foobarbaz1@chromium.org 2013-04-28 04:52:41 +0000   13) Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """
         self.tool.scm().blame = blame
 
         test_port = self._setup_test_port()
 
         old_builder_data = self.command.builder_data
@@ skipping 15 matching lines @@
             return self.command._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
-        self.tool.executive = MockLineRemovingExecutive(
-            should_return_zero_when_run=set(self.SVN_REMOTE_CMD))
+        self.tool.executive = MockLineRemovingExecutive()
 
         old_exact_matches = builders._exact_matches
         try:
             builders._exact_matches = {
                 "MOCK Win": {"port_name": "test-win-win7", "specifiers": set(["mock-specifier"])},
             }
 
             self.command.tree_status = lambda: 'open'
             webkitpy.tool.commands.rebaseline._get_branch_name_or_ref = lambda x: 'auto-rebaseline-temporary-branch'
             self.command.execute(MockOptions(optimize=True, verbose=False, results_directory=False), [], self.tool)
             self.assertEqual(self.tool.executive.calls, [
-                self.SVN_REMOTE_CMD,
                 [['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', '', 'fast/dom/prototype-taco.html']],
                 ['git', 'cl', 'upload', '-f'],
                 ['git', 'pull'],
                 ['git', 'cl', 'dcommit', '-f'],
                 ['git', 'config', 'branch.auto-rebaseline-alt-temporary-branch.rietveldissue'],
-                ['git', 'cl', 'set_close'],
             ])
 
             self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
 Bug(foo) [ Linux Mac XP ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
         finally:
             builders._exact_matches = old_exact_matches
 
     def test_execute_stuck_on_alternate_rebaseline_branch(self):
         def blame(path):
@@ skipping 23 matching lines @@
             return self.command._builder_data
 
         self.command.builder_data = builder_data
 
         self.tool.filesystem.write_text_file(test_port.path_to_generic_test_expectations_file(), """
 Bug(foo) fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
 
         self._write_test_file(test_port, 'fast/dom/prototype-taco.html', "Dummy test contents")
 
-        self.tool.executive = MockLineRemovingExecutive(
-            should_return_zero_when_run=set(self.SVN_REMOTE_CMD))
+        self.tool.executive = MockLineRemovingExecutive()
 
         old_exact_matches = builders._exact_matches
         try:
             builders._exact_matches = {
                 "MOCK Win": {"port_name": "test-win-win7", "specifiers": set(["mock-specifier"])},
             }
 
             self.command.tree_status = lambda: 'open'
             webkitpy.tool.commands.rebaseline._get_branch_name_or_ref = lambda x: 'auto-rebaseline-alt-temporary-branch'
             self.command.execute(MockOptions(optimize=True, verbose=False, results_directory=False), [], self.tool)
             self.assertEqual(self.tool.executive.calls, [
-                self.SVN_REMOTE_CMD,
                 [['python', 'echo', 'optimize-baselines', '--no-modify-scm', '--suffixes', '', 'fast/dom/prototype-taco.html']],
                 ['git', 'cl', 'upload', '-f'],
                 ['git', 'pull'],
                 ['git', 'cl', 'dcommit', '-f'],
                 ['git', 'config', 'branch.auto-rebaseline-temporary-branch.rietveldissue'],
-                ['git', 'cl', 'set_close'],
             ])
 
             self.assertEqual(self.tool.filesystem.read_text_file(test_port.path_to_generic_test_expectations_file()), """
 Bug(foo) [ Linux Mac XP ] fast/dom/prototype-taco.html [ NeedsRebaseline ]
 """)
         finally:
             builders._exact_matches = old_exact_matches
 
 
 class TestRebaselineOMatic(_BaseTestCase):
@@ skipping 37 matching lines @@
         oc.capture_output()
         self.command._do_one_rebaseline()
         out, _, _ = oc.restore_output()
 
         self.assertEqual(out, 'MOCK STDOUT\n')
         self.assertEqual(self.tool.executive.calls, [
             ['git', 'pull'],
             ['/mock-checkout/third_party/WebKit/Tools/Scripts/webkit-patch', 'auto-rebaseline', '--verbose'],
         ])
         self.assertEqual(self._logs, ['MOCK STDOUT'])