[WPT Export] Fix cwd on run_command calls in ChromiumCommit

third_party/WebKit/Tools/Scripts/webkitpy/w3c/local_wpt_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.common.system.filesystem_mock import MockFileSystem
 from webkitpy.w3c.local_wpt import LocalWPT
+from webkitpy.w3c.common_unittest import mock_command_exec_strict
 
 
 class LocalWPTTest(unittest.TestCase):
 
     def test_fetch_when_wpt_dir_exists(self):
         host = MockHost()
         host.filesystem = MockFileSystem(files={
             '/tmp/wpt': ''
         })
 
@@ skipping 11 matching lines @@
         host = MockHost()
         host.filesystem = MockFileSystem()
 
         local_wpt = LocalWPT(host)
         local_wpt.fetch()
 
         self.assertEqual(len(host.executive.calls), 3)
         self.assertEqual(host.executive.calls[0][1], 'clone')
 
     def test_constructor(self):
-        #
         host = MockHost()
         LocalWPT(host)
         self.assertEqual(len(host.executive.calls), 0)
 
     def test_run(self):
         host = MockHost()
         host.filesystem = MockFileSystem()
         local_wpt = LocalWPT(host)
         local_wpt.run(['echo', 'rutabaga'])
         self.assertEqual(host.executive.calls, [['echo', 'rutabaga']])
 
     def test_last_wpt_exported_commit(self):
         host = MockHost()
-        return_vals = [
-            'deadbeefcafe',
-            '123',
-            '9ea4fc353a4b1c11c6e524270b11baa4d1ddfde8',
-        ]
-        host.executive = MockExecutive(run_command_fn=lambda _: return_vals.pop())
+        host.executive = mock_command_exec_strict({
+            'rev-list': '9ea4fc353a4b1c11c6e524270b11baa4d1ddfde8',
+            'footers': 'Cr-Commit-Position: 123',
+            'crrev-parse': 'add087a97844f4b9e307d9a216940582d96db306',
+        })
         host.filesystem = MockFileSystem()
         local_wpt = LocalWPT(host)
 
         wpt_sha, chromium_commit = local_wpt.most_recent_chromium_commit()
         self.assertEqual(wpt_sha, '9ea4fc353a4b1c11c6e524270b11baa4d1ddfde8')
         self.assertEqual(chromium_commit.position, '123')
-        self.assertEqual(chromium_commit.sha, 'deadbeefcafe')
+        self.assertEqual(chromium_commit.sha, 'add087a97844f4b9e307d9a216940582d96db306')
 
     def test_last_wpt_exported_commit_not_found(self):
         host = MockHost()
         host.executive = MockExecutive(run_command_fn=lambda _: '')
         host.filesystem = MockFileSystem()
         local_wpt = LocalWPT(host)
 
         commit = local_wpt.most_recent_chromium_commit()
         self.assertEqual(commit, (None, None))
 
@@ skipping 13 matching lines @@
             ['git', 'reset', '--hard', 'HEAD'],
             ['git', 'clean', '-fdx'],
             ['git', 'checkout', 'origin/master'],
             ['git', 'branch', '-a'],
             ['git', 'branch', '-a'],
             ['git', 'checkout', '-b', 'chromium-export-try'],
             ['git', 'apply', '-'],
             ['git', 'add', '.'],
             ['git', 'commit', '--author', 'author', '-am', 'message'],
             ['git', 'push', '-f', 'github', 'chromium-export-try']])