Revert 32057, 32058, 32059, 32062 because they still have unwanted side-effects.

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 revert
 from super_mox import mox, SuperMoxTestBase
 
@@ skipping 43 matching lines @@
     self.mox.ReplayAll()
 
     self.assertEquals(revert.Main(['revert', '-c', '-f', '-n', '-m', 'bleh',
                                    '-r', 'foo@example.com', '42', '23']),
                       31337)
 
 
 class RevertRevertUnittest(RevertTestsBase):
   def setUp(self):
     RevertTestsBase.setUp(self)
-    self.mox.StubOutWithMock(revert.gclient_scm.scm.SVN, 'CaptureStatus')
 
   def testRevert(self):
     revert.gcl.GetRepositoryRoot().AndReturn('foo')
     revert.os.chdir('foo')
     entries = [{
       'author': 'Georges',
       'paths': [
           {'path': 'proto://fqdn/repo/random_file'}
       ],
     }]
     revert.CaptureSVNLog(['-r', '42', '-v']).AndReturn(entries)
     revert.GetRepoBase().AndReturn('proto://fqdn/repo/')
-    revert.gclient_scm.scm.SVN.CaptureStatus(['random_file']).AndReturn([])
+    revert.gclient_scm.CaptureSVNStatus(['random_file']).AndReturn([])
     revert.gcl.RunShell(['svn', 'up', 'random_file'])
     revert.os.path.isdir('random_file').AndReturn(False)
     status = """--- Reverse-merging r42 into '.':
 M    random_file
 """
     revert.gcl.RunShellWithReturnCode(['svn', 'merge', '-c', '-42',
                                        'random_file'],
                                       print_output=True).AndReturn([status, 0])
     change = self.mox.CreateMockAnything()
     revert.gcl.ChangeInfo('revert42', 0, 0, 'Reverting 42.\n\nbleh',
@@ skipping 15 matching lines @@
       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()