Make bot_update on win more resilient

tests/bot_update_coverage_test.py

Index: tests/bot_update_coverage_test.py
diff --git a/tests/bot_update_coverage_test.py b/tests/bot_update_coverage_test.py
index 9b7715e4e4afe73a06f8434818d50e1c01f17509..54e5b09c1874e1d61564c4aff2d274b7a3dc60e3 100755
--- a/tests/bot_update_coverage_test.py
+++ b/tests/bot_update_coverage_test.py
@@ -186,6 +186,10 @@ class BotUpdateUnittests(unittest.TestCase):
     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)
+
   def testBasic(self):
     bot_update.ensure_checkout(**self.params)
     return self.call.records
@@ -196,15 +200,18 @@ class BotUpdateUnittests(unittest.TestCase):
     return self.call.records
 
   def testBreakLocks(self):
-    sys.platform = 'win'
-    self.call.expect(('gclient.bat', 'sync')).returns(self.gclient)
+    self.overrideSetupForWindows()
     bot_update.ensure_checkout(**self.params)
     gclient_sync_cmd = None
+    gclient_cleanup_cmd = None
     for record in self.call.records:
       args = record[0]
       if args[0] == 'gclient.bat' and args[1] == 'sync':
         gclient_sync_cmd = args
+      elif args[0] == 'gclient.bat' and args[1] == 'cleanup':
+        gclient_cleanup_cmd = args
     self.assertTrue('--break_repo_locks' in gclient_sync_cmd)
+    self.assertTrue('--break_repo_locks' in gclient_cleanup_cmd)
 
 
 if __name__ == '__main__':