Reapply 32057, 32058, 32059, 32062 and fixes problems introduced by these changes.

tests/trychange_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 trychange.py."""
 
 import optparse
 
 # Local imports
 import trychange
 from super_mox import mox, SuperMoxTestBase
 
 
 class TryChangeTestsBase(SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   pass
 
 
 class TryChangeUnittest(TryChangeTestsBase):
   """General trychange.py tests."""
   def testMembersChanged(self):
     members = [
       'EscapeDot', 'GIT', 'GetSourceRoot',
       'GetTryServerSettings', 'GuessVCS',
       'HELP_STRING', 'InvalidScript', 'NoTryServerAccess', 'PathDifference',
       'RunCommand', 'SCM', 'SVN', 'TryChange', 'USAGE',
-      'datetime', 'gcl', 'gclient_scm', 'getpass', 'logging',
-      'optparse', 'os', 'presubmit_support', 'shutil', 'socket', 'subprocess',
-      'sys', 'tempfile', 'upload', 'urllib',
+      'datetime', 'gcl', 'getpass', 'logging',
+      'optparse', 'os', 'presubmit_support', 'scm', 'shutil', 'socket',
+      'subprocess', 'sys', 'tempfile', 'upload', 'urllib',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange, members)
 
 
 class SVNUnittest(TryChangeTestsBase):
   """trychange.SVN tests."""
   def setUp(self):
     SuperMoxTestBase.setUp(self)
     self.fake_root = '/fake_root'
@@ skipping 50 matching lines @@
     trychange.upload.RunShell(['git', 'rev-parse', '--show-cdup']).AndReturn(
         self.fake_root)
     trychange.os.path.abspath(self.fake_root).AndReturn(self.fake_root)
     self.mox.ReplayAll()
     self.assertEqual(self.git.GetLocalRoot(), self.fake_root)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()