gclient_scm: Only _DeleteOrMove if _Clone fails

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 1279 matching lines @@
     self.assertRaises(gclient_scm.gclient_utils.Error,
                       git_svn_scm.GetUsableRev, too_big, options)
 
   def testUpdateNoDotGit(self):
     options = self.Options()
 
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.exists(os.path.join(self.base_path, '.git')
                                ).AndReturn(False)
-    gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
-    gclient_scm.os.path.exists(os.path.join(self.base_path, '.git')
-                               ).AndReturn(False)
-    self.mox.StubOutWithMock(gclient_scm.os, 'listdir', True)
-    gclient_scm.os.listdir(self.base_path).AndReturn([])
 
     self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True)
     # pylint: disable=E1120
     gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url,
                                   options)
     self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True)
     gclient_scm.subprocess2.check_output(
         ['git', 'ls-files'], cwd=self.base_path,
         env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('')
     gclient_scm.subprocess2.check_output(
         ['git', 'rev-parse', '--verify', 'HEAD'],
         cwd=self.base_path,
         env=gclient_scm.scm.GIT.ApplyEnvVars({}),
         stderr=-1,
         ).AndReturn('')
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.update(options, None, [])
     self.checkstdout('\n')
 
-  def testUpdateNoDotGitForce(self):
-    options = self.Options(force=True)
+  def testUpdateConflict(self):
+    options = self.Options()
 
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.exists(os.path.join(self.base_path, '.git')
                                ).AndReturn(False)
-    gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
-    gclient_scm.os.path.exists(os.path.join(self.base_path, '.git')
-                               ).AndReturn(False)
-    self.mox.StubOutWithMock(gclient_scm.os, 'listdir', True)
-    gclient_scm.os.listdir(self.base_path).AndReturn([])
+
     self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Clone', True)
     # pylint: disable=E1120
+    gclient_scm.GitWrapper._Clone(
+        'refs/remotes/origin/master', self.url, options
+    ).AndRaise(gclient_scm.subprocess2.CalledProcessError(None, None, None,
+                                                          None, None))
+    self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_DeleteOrMove', True)
+    gclient_scm.GitWrapper._DeleteOrMove(False)
     gclient_scm.GitWrapper._Clone('refs/remotes/origin/master', self.url,
                                   options)
-    # pylint: disable=E1120
     self.mox.StubOutWithMock(gclient_scm.subprocess2, 'check_output', True)
     gclient_scm.subprocess2.check_output(
         ['git', 'ls-files'], cwd=self.base_path,
         env=gclient_scm.scm.GIT.ApplyEnvVars({}), stderr=-1,).AndReturn('')
     gclient_scm.subprocess2.check_output(
         ['git', 'rev-parse', '--verify', 'HEAD'],
         cwd=self.base_path,
         env=gclient_scm.scm.GIT.ApplyEnvVars({}),
         stderr=-1,
         ).AndReturn('')
@@ skipping 24 matching lines @@
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: