commit 90fe58b61073f2bbd6237997d4a50bafcb2bb6f6
author borenet@google.com <borenet@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Thu May 01 18:22:00 2014 +0000
committer borenet@google.com <borenet@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Thu May 01 18:22:00 2014 +0000
tree 0897c413f221e71f978437c4b5b4dbf788b8afca
parent f75c230c9c052b0879ac9af44261f7071008f252

gclient_scm: Only _DeleteOrMove if _Clone fails

BUG=

Review URL: https://codereview.chromium.org/262813002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@267587 0039d316-1c4b-4281-b951-d872f2087c98

tests/gclient_scm_test.py

diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 370e75f..7c0b386 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -1297,11 +1297,6 @@
     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
@@ -1324,23 +1319,24 @@
     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,