Improve SVN.Revert() to catch more corner cases.

tests/gclient_scm_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 150 matching lines @@
         ['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 testRevert2Files(self):
-    options = self.Options(verbose=True)
-    gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
-    items = [
-      ('M      ', 'a'),
-      ('A      ', 'b'),
-    ]
-    file_path1 = join(self.base_path, 'a')
-    file_path2 = join(self.base_path, 'b')
-    gclient_scm.scm.SVN.CaptureStatus(self.base_path).AndReturn(items)
-    gclient_scm.os.path.exists(file_path1).AndReturn(True)
-    gclient_scm.os.path.isfile(file_path1).AndReturn(True)
-    gclient_scm.os.remove(file_path1)
-    gclient_scm.os.path.exists(file_path2).AndReturn(True)
-    gclient_scm.os.path.isfile(file_path2).AndReturn(True)
-    gclient_scm.os.remove(file_path2)
-    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)
-    self.checkstdout(
-        ('%s\n%s\n' % (join(self.base_path, 'a'),
-            join(self.base_path, 'b'))))
-
   def testRevertDirectory(self):
     options = self.Options(verbose=True)
     gclient_scm.os.path.isdir(self.base_path).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)
@@ skipping 641 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: