commit a9d9aa429f907482b9875da5ca7a01deef9635d5
author borenet@google.com <borenet@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Tue Apr 22 17:42:54 2014 +0000
committer borenet@google.com <borenet@google.com@0039d316-1c4b-4281-b951-d872f2087c98> Tue Apr 22 17:42:54 2014 +0000
tree 6a258ab8f9fc8c266e1729ec691234c6a287b357
parent dabbea27f0cad4102050370bc1c1bd78819f3f44

gclient: Only _DeleteOrMove if the destination directory is non-empty

BUG=364601

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@265298 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 c49b524..dbd94f0 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -1300,6 +1300,8 @@
     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
@@ -1332,6 +1334,8 @@
     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,