Add code to automatically svn cleanup during svn update.
BUG=36135
TEST=gclient sync on a svn lock'ed directory will work automatically
Review URL: http://codereview.chromium.org/3028053
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@55438 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 4f971b2..92ea2be 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -255,6 +255,11 @@
}
gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
).AndReturn(False)
+
+ # Verify no locked files.
+ gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
+ ).AndReturn([])
+
# Checkout or update.
gclient_scm.os.path.exists(base_path).AndReturn(True)
gclient_scm.scm.SVN.CaptureInfo(
@@ -295,6 +300,10 @@
gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, 'DEPS')
).AndReturn(False)
+ # Verify no locked files.
+ gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
+ ).AndReturn([])
+
# When checking out a single file, we issue an svn checkout and svn update.
files_list = self.mox.CreateMockAnything()
gclient_scm.scm.SVN.Run(
@@ -363,6 +372,10 @@
).AndReturn(True)
gclient_scm.os.remove(gclient_scm.os.path.join(base_path, 'DEPS'))
+ # Verify no locked files.
+ gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
+ ).AndReturn([])
+
# When checking out a single file, we issue an svn checkout and svn update.
files_list = self.mox.CreateMockAnything()
gclient_scm.scm.SVN.Run(
@@ -399,6 +412,10 @@
gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.svn')
).AndReturn(True)
+ # Verify no locked files.
+ gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
+ ).AndReturn([])
+
# Now we fall back on scm.update().
files_list = self.mox.CreateMockAnything()
gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')