Make revert more resilient to partial sync failure.

tests/gclient_scm_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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=E1101,E1103,W0403
 
 # Import before super_mox to keep valid references.
@@ skipping 47 matching lines @@
     gclient_scm.scm.SVN.current_version = None
     # Absolute path of the fake checkout directory.
     self.base_path = join(self.root_dir, self.relpath)
 
   def tearDown(self):
     SuperMoxTestBase.tearDown(self)
 
 
 class SVNWrapperTestCase(BaseTestCase):
   class OptionsObject(object):
-    def __init__(self, verbose=False, revision=None):
+    def __init__(self, verbose=False, revision=None, force=False):
       self.verbose = verbose
       self.revision = revision
       self.manually_grab_svn_rev = True
       self.deps_os = None
-      self.force = False
+      self.force = force
       self.reset = False
       self.nohooks = False
 
   def Options(self, *args, **kwargs):
     return self.OptionsObject(*args, **kwargs)
 
   def setUp(self):
     BaseTestCase.setUp(self)
     self.url = self.SvnUrl()
 
@@ skipping 41 matching lines @@
     self.assertRaisesError(exception, scm.RunCommand,
                            'update', options, self.args)
 
   def testRunCommandUnknown(self):
     # TODO(maruel): if ever used.
     pass
 
   def testRevertMissing(self):
     options = self.Options(verbose=True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
+    gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     gclient_scm.scm.SVN.Capture(['--version']
         ).AndReturn('svn, version 1.5.1 (r32289)')
     # It'll to a checkout instead.
     gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
     gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     # Checkout.
     gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     files_list = self.mox.CreateMockAnything()
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['checkout', self.url, self.base_path, '--force', '--ignore-externals'],
         cwd=self.root_dir,
         file_list=files_list)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.revert(options, self.args, files_list)
     self.checkstdout(
         ('\n_____ %s is missing, synching instead\n' % self.relpath))
 
+  def testRevertNoDotSvn(self):
+    options = self.Options(verbose=True, force=True)
+    gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
+    gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(False)
+    gclient_scm.os.path.isdir(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.isdir(join(self.base_path, '.hg')).AndReturn(False)
+    # Checkout.
+    gclient_scm.os.path.exists(self.base_path).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
+    gclient_scm.os.path.exists(self.base_path).AndReturn(False)
+    files_list = self.mox.CreateMockAnything()
+    gclient_scm.scm.SVN.Capture(['--version']).AndReturn('svn, version 1.6')
+    gclient_scm.scm.SVN.RunAndGetFileList(
+        options.verbose,
+        ['checkout', self.url, self.base_path, '--force', '--ignore-externals'],
+        cwd=self.root_dir,
+        file_list=files_list)
+
+    self.mox.ReplayAll()
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
+    scm.revert(options, self.args, files_list)
+    self.checkstdout(
+        '\n_____ %s is not a valid svn checkout, synching instead\n' %
+        self.relpath)
+
   def testRevertNone(self):
     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)
     gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn([])
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['update', '--revision', 'BASE', '--ignore-externals'],
         cwd=self.base_path,
         file_list=mox.IgnoreArg())
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     file_list = []
     scm.revert(options, self.args, file_list)
 
   def testRevertDirectory(self):
     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 = [
       ('~      ', 'a'),
     ]
     gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn(items)
     file_path = join(self.base_path, 'a')
     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)
@@ skipping 704 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: