Cleanup the unit tests by mocking more system functions.

tests/revert_unittest.py

 #!/usr/bin/python
 # Copyright (c) 2009 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 revert.py."""
 
-import os
-import unittest
-
-# Local imports
 import revert
-import super_mox
-from super_mox import mox
+from super_mox import mox, SuperMoxTestBase
 
 
-class RevertTestsBase(super_mox.SuperMoxTestBase):
+class RevertTestsBase(SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
-    super_mox.SuperMoxTestBase.setUp(self)
+    SuperMoxTestBase.setUp(self)
     self.mox.StubOutWithMock(revert, 'gcl')
     self.mox.StubOutWithMock(revert, 'gclient')
     self.mox.StubOutWithMock(revert, 'gclient_scm')
-    self.mox.StubOutWithMock(revert, 'os')
-    self.mox.StubOutWithMock(revert.os, 'path')
-    self.mox.StubOutWithMock(revert.sys, 'stdout')
 
     # These functions are not tested.
     self.mox.StubOutWithMock(revert, 'GetRepoBase')
     self.mox.StubOutWithMock(revert, 'CaptureSVNLog')
 
 
 class RevertUnittest(RevertTestsBase):
   """General revert.py tests."""
   def testMembersChanged(self):
     members = [
       'CaptureSVNLog', 'GetRepoBase', 'Main', 'ModifiedFile', 'NoBlameList',
       'NoModifiedFile', 'OutsideOfCheckout', 'Revert', 'UniqueFast',
       'exceptions', 'gcl', 'gclient', 'gclient_scm', 'gclient_utils',
       'optparse', 'os', 'sys', 'xml'
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(revert, members)
 
 
 class RevertMainUnittest(RevertTestsBase):
   def setUp(self):
     RevertTestsBase.setUp(self)
     self.mox.StubOutWithMock(revert, 'gcl')
-    self.mox.StubOutWithMock(revert, 'os')
-    self.mox.StubOutWithMock(revert.os, 'path')
-    self.mox.StubOutWithMock(revert, 'sys')
     self.mox.StubOutWithMock(revert, 'Revert')
+    self.fake_root = '/revert/RevertMainUnittest/ShouldntExist'
 
   def testMain(self):
-    revert.gcl.GetInfoDir().AndReturn('foo')
-    revert.os.path.exists('foo').AndReturn(True)
+    # OptParser calls revert.os.path.exists and is a pain when mocked.
+    self.UnMock(revert.os.path, 'exists')
+    revert.gcl.GetInfoDir().AndReturn(self.fake_root)
+    #revert.os.path.exists(self.fake_root).AndReturn(True)
+    revert.os.mkdir(self.fake_root)
+    revert.gcl.GetInfoDir().AndReturn(self.fake_root)
     revert.Revert([42, 23], True, True, False, 'bleh', ['foo@example.com']
         ).AndReturn(31337)
     self.mox.ReplayAll()
 
     self.assertEquals(revert.Main(['revert', '-c', '-f', '-n', '-m', 'bleh',
                                    '-r', 'foo@example.com', '42', '23']),
                       31337)
 
 
 class RevertRevertUnittest(RevertTestsBase):
@@ skipping 38 matching lines @@
     ]
     for line in outputs:
       revert.sys.stdout.write(line)
       revert.sys.stdout.write('\n')
     self.mox.ReplayAll()
 
     revert.Revert([42], True, True, False, 'bleh', ['foo@example.com'])
 
 
 if __name__ == '__main__':
+  import unittest
   unittest.main()