Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Unified Diff: tests/gclient_scm_test.py

Issue 10169034: Fix an error in gclient revert where a directory is unexpected and locked (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scm.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/gclient_scm_test.py
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index ebe5e45dca9a9b246194b1ab1f9d65de56567272..0d8e722d084d44faf8548375fe21d6ab2296ed5c 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -290,7 +290,8 @@ class SVNWrapperTestCase(BaseTestCase):
('~ ', '.'),
]
gclient_scm.scm.SVN.CaptureStatus(None, self.base_path).AndReturn(items)
- file_path = join(self.base_path, '.')
+ # RemoveDirectory() doesn't work on path ending with '.', like 'foo/.'.
+ file_path = self.base_path
gclient_scm.os.path.exists(file_path).AndReturn(True)
gclient_scm.os.path.isfile(file_path).AndReturn(False)
gclient_scm.os.path.islink(file_path).AndReturn(False)
@@ -305,7 +306,7 @@ class SVNWrapperTestCase(BaseTestCase):
relpath=self.relpath)
file_list2 = []
scm.revert(options, self.args, file_list2)
- self.checkstdout(('%s\n' % file_path))
+ self.checkstdout(('%s\n' % os.path.join(file_path, '.')))
def testStatus(self):
options = self.Options(verbose=True)
« no previous file with comments | « scm.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698