Revert of Revert "Add (another) argument to break git locks in gclient."

tests/gclient_scm_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Unit tests for gclient_scm.py."""
 
 # pylint: disable=E1103
 
 # Import before super_mox to keep valid references.
@@ skipping 115 matching lines @@
       self.manually_grab_svn_rev = True
       self.deps_os = None
       self.force = False
       self.reset = False
       self.nohooks = False
       self.no_history = False
       self.upstream = False
       self.cache_dir = None
       self.merge = False
       self.jobs = 1
+      self.break_repo_locks = False
       self.delete_unversioned_trees = False
 
   sample_git_import = """blob
 mark :1
 data 6
 Hello
 
 blob
 mark :2
 data 4
@@ skipping 348 matching lines @@
       self.fail()
     except (gclient_scm.gclient_utils.Error, subprocess2.CalledProcessError):
       # The exact exception text varies across git versions so it's not worth
       # verifying it. It's fine as long as it throws.
       pass
     # Manually flush stdout since we can't verify it's content accurately across
     # git versions.
     sys.stdout.getvalue()
     sys.stdout.close()
 
+  def testUpdateLocked(self):
+    if not self.enabled:
+      return
+    options = self.Options()
+    scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
+                                relpath=self.relpath)
+    file_path = join(self.base_path, '.git', 'index.lock')
+    with open(file_path, 'w'):
+      pass
+    with self.assertRaisesRegexp(subprocess2.CalledProcessError,
+                                 'Unable to create.*/index.lock'):
+      scm.update(options, (), [])
+    sys.stdout.close()
+
+  def testUpdateLockedBreak(self):
+    if not self.enabled:
+      return
+    options = self.Options()
+    options.break_repo_locks = True
+    scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
+                                relpath=self.relpath)
+    file_path = join(self.base_path, '.git', 'index.lock')
+    with open(file_path, 'w'):
+      pass
+    scm.update(options, (), [])
+    self.assertRegexpMatches(sys.stdout.getvalue(),
+                             "breaking lock.*\.git/index\.lock")
+    self.assertFalse(os.path.exists(file_path))
+    sys.stdout.close()
+
   def testUpdateConflict(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_path = join(self.base_path, 'b')
     open(file_path, 'w').writelines('conflict\n')
     scm._Run(['commit', '-am', 'test'], options)
     scm._AskForData = self._GetAskForDataCallback(
@@ skipping 21 matching lines @@
 
 class ManagedGitWrapperTestCaseMox(BaseTestCase):
   class OptionsObject(object):
     def __init__(self, verbose=False, revision=None, force=False):
       self.verbose = verbose
       self.revision = revision
       self.deps_os = None
       self.force = force
       self.reset = False
       self.nohooks = False
+      self.break_repo_locks = False
       # TODO(maruel): Test --jobs > 1.
       self.jobs = 1
 
   def Options(self, *args, **kwargs):
     return self.OptionsObject(*args, **kwargs)
 
   def checkstdout(self, expected):
     value = sys.stdout.getvalue()
     sys.stdout.close()
     # pylint: disable=E1101
@@ skipping 384 matching lines @@
 
 if __name__ == '__main__':
   level = logging.DEBUG if '-v' in sys.argv else logging.FATAL
   logging.basicConfig(
       level=level,
       format='%(asctime).19s %(levelname)s %(filename)s:'
              '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: