gclient_scm: add a new test case for SCMWrapper.revert

tests/gclient_test.py

 #!/usr/bin/python
 #
 # Copyright 2008-2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 18 matching lines @@
 import gclient_utils
 import super_mox
 from super_mox import mox
 
 
 class BaseTestCase(super_mox.SuperMoxTestBase):
   def setUp(self):
     super_mox.SuperMoxTestBase.setUp(self)
     self.mox.StubOutWithMock(gclient.os.path, 'exists')
     self.mox.StubOutWithMock(gclient.os.path, 'isdir')
+    self.mox.StubOutWithMock(gclient.os, 'remove')
     self.mox.StubOutWithMock(gclient.sys, 'stdout')
     self.mox.StubOutWithMock(gclient_utils, 'subprocess')
     # These are not tested.
     self.mox.StubOutWithMock(gclient, 'FileRead')
     self.mox.StubOutWithMock(gclient, 'FileWrite')
     self.mox.StubOutWithMock(gclient_utils, 'SubprocessCall')
     self.mox.StubOutWithMock(gclient_utils, 'RemoveDirectory')
 
   # Like unittest's assertRaises, but checks for Gclient.Error.
   def assertRaisesError(self, msg, fn, *args, **kwargs):
@@ skipping 1061 matching lines @@
     print(os.path.join(base_path, 'a'))
     print(os.path.join(base_path, 'b'))
     gclient_scm.RunSVN(['revert', 'a', 'b'], base_path)
 
     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 testRevertUnversionedUnexpectedFile(self):
+    options = self.Options(verbose=True)
+    base_path = os.path.join(self.root_dir, self.relpath)
+    gclient.os.path.isdir(base_path).AndReturn(True)
+    items = [
+      ('~      ', 'a'),
+    ]
+    gclient_scm.CaptureSVNStatus(base_path).AndReturn(items)
+    file_path = os.path.join(base_path, 'a')
+    print(file_path)
+    gclient_scm.os.remove(file_path).AndRaise(EnvironmentError())
+    gclient_utils.RemoveDirectory(file_path)
+    gclient_scm.RunSVN(['revert', 'a'], base_path)
+
+    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 testStatus(self):
     options = self.Options(verbose=True)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir(base_path).AndReturn(True)
     gclient_scm.RunSVNAndGetFileList(['status'] + self.args, base_path,
                                  []).AndReturn(None)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
@@ skipping 252 matching lines @@
 """
     gclient_scm.CaptureSVN = CaptureSVNMock
     info = gclient_scm.CaptureSVNStatus(None)
     self.assertEquals(info, [])
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: