bot_update: Use 'gclient' from same repository.

tests/bot_update_coverage_test.py

 #!/usr/bin/env python
 # Copyright (c) 2015 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 codecs
 import copy
 import json
 import os
 import sys
@@ skipping 149 matching lines @@
 def fake_git(*args, **kwargs):
   return bot_update.call('git', *args, **kwargs)
 
 
 class BotUpdateUnittests(unittest.TestCase):
   def setUp(self):
     sys.platform = 'linux2'  # For consistency, ya know?
     self.filesystem = FakeFilesystem()
     self.call = MockedCall(self.filesystem)
     self.gclient = MockedGclientSync(self.filesystem)
-    self.call.expect(('gclient', 'sync')).returns(self.gclient)
+    self.call.expect(
+        (sys.executable, '-u', bot_update.GCLIENT_PATH, 'sync')
+    ).returns(self.gclient)
     self.old_call = getattr(bot_update, 'call')
     self.params = copy.deepcopy(DEFAULT_PARAMS)
     setattr(bot_update, 'call', self.call)
     setattr(bot_update, 'git', fake_git)
 
     self.old_os_cwd = os.getcwd
     setattr(os, 'getcwd', lambda: '/b/build/slave/foo/build')
 
     setattr(bot_update, 'open', self.filesystem.open)
     self.old_codecs_open = codecs.open
     setattr(codecs, 'open', self.filesystem.open)
 
   def tearDown(self):
     setattr(bot_update, 'call', self.old_call)
     setattr(os, 'getcwd', self.old_os_cwd)
     delattr(bot_update, 'open')
     setattr(codecs, 'open', self.old_codecs_open)
 
   def overrideSetupForWindows(self):
     sys.platform = 'win'
-    self.call.expect(('gclient.bat', 'sync')).returns(self.gclient)
+    self.call.expect(
+        (sys.executable, '-u', bot_update.GCLIENT_PATH, 'sync')
+    ).returns(self.gclient)
 
   def testBasic(self):
     bot_update.ensure_checkout(**self.params)
     return self.call.records
 
   def testBasicShallow(self):
     self.params['shallow'] = True
     bot_update.ensure_checkout(**self.params)
     return self.call.records
 
   def testBreakLocks(self):
     self.overrideSetupForWindows()
     bot_update.ensure_checkout(**self.params)
     gclient_sync_cmd = None
     for record in self.call.records:
       args = record[0]
-      if args[0] == 'gclient.bat' and args[1] == 'sync':
+      if args[:4] == (sys.executable, '-u', bot_update.GCLIENT_PATH, 'sync'):
         gclient_sync_cmd = args
     self.assertTrue('--break_repo_locks' in gclient_sync_cmd)
 
   def testGitCheckoutBreaksLocks(self):
     self.overrideSetupForWindows()
     path = '/b/build/slave/foo/build/.git'
     lockfile = 'index.lock'
     removed = []
     old_os_walk = os.walk
     old_os_remove = os.remove
     setattr(os, 'walk', lambda _: [(path, None, [lockfile])])
     setattr(os, 'remove', removed.append)
     bot_update.ensure_checkout(**self.params)
     setattr(os, 'walk', old_os_walk)
     setattr(os, 'remove', old_os_remove)
     self.assertTrue(os.path.join(path, lockfile) in removed)
 
 
 if __name__ == '__main__':
   unittest.main()