Fix gclient unittests.

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 17 matching lines @@
 import gclient_scm
 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, 'isfile')
     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')
 
@@ skipping 1036 matching lines @@
     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)
 
   def testRevertNone(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.CaptureSVNStatus(base_path).AndReturn([])
+    gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'], base_path,

[Nicolas Sylvain, 2009/09/21 22:30:43]

80 chars

+                                     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)
     base_path = os.path.join(self.root_dir, self.relpath)
     gclient.os.path.isdir(base_path).AndReturn(True)
     items = [
       ('M      ', 'a'),
       ('A      ', 'b'),
     ]
+    file_path1 = os.path.join(base_path, 'a')
+    file_path2 = os.path.join(base_path, 'b')
     gclient_scm.CaptureSVNStatus(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.RunSVNAndGetFileList(['update', '--revision', 'BASE'], base_path,

[Nicolas Sylvain, 2009/09/21 22:30:43]

80 chars

+                                     mox.IgnoreArg())
     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)
-    self.assertEquals(sorted(file_list), sorted([os.path.join(base_path, 'a'),
-                                                 os.path.join(base_path, 'b')]))
 
-  def testRevertUnversionedUnexpectedFile(self):
+  def testRevertDirectory(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_scm.os.path.exists(file_path).AndReturn(True)
+    gclient_scm.os.path.isfile(file_path).AndReturn(False)
+    gclient_scm.os.path.isdir(file_path).AndReturn(True)
+    #gclient_scm.os.remove(file_path)

[Nicolas Sylvain, 2009/09/21 22:30:43]

why?

     gclient_utils.RemoveDirectory(file_path)
-    gclient_scm.RunSVN(['revert', 'a'], base_path)
+    file_list1 = []
+    gclient_scm.RunSVNAndGetFileList(['update', '--revision', 'BASE'], base_path,

[Nicolas Sylvain, 2009/09/21 22:30:43]

80 chars

+                                     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)
-    # TODO(msb): fix bug (file_list contains dupes) and enable assertion
-    #self.assertEquals(file_list, [os.path.join(base_path, 'a')])
+    file_list2 = []
+    scm.revert(options, self.args, file_list2)
 
   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,
@@ skipping 253 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: