Fix an error in gclient revert where a directory is unexpected and locked

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 272 matching lines @@
 
   def testRevertDot(self):
     self.mox.StubOutWithMock(gclient_scm.SVNWrapper, 'update')
     options = self.Options(verbose=True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True)
     items = [
       ('~      ', '.'),
     ]
     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)
     gclient_scm.os.path.isdir(file_path).AndReturn(True)
     gclient_scm.gclient_utils.RemoveDirectory(file_path)
     # pylint: disable=E1120
     gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
     gclient_scm.SVNWrapper.update(options, [], ['.'])
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             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)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['status'] + self.args + ['--ignore-externals'],
         cwd=self.base_path,
         file_list=[]).AndReturn(None)
 
@@ skipping 901 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: