Fix unit tests (mostly esthetical)

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
@@ skipping 24 matching lines @@
     self.options.email = None
 
 
 class TryChangeUnittest(TryChangeTestsBase):
   """General trychange.py tests."""
   def testMembersChanged(self):
     members = [
       'EscapeDot', 'GIT', 'GuessVCS',
       'HELP_STRING', 'InvalidScript', 'NoTryServerAccess', 'PrintSuccess',
       'SCM', 'SVN', 'TryChange', 'USAGE',
-      'breakpad', 'datetime', 'gclient_utils', 'getpass', 'logging',
+      'breakpad', 'datetime', 'errno', 'gclient_utils', 'getpass', 'logging',
       'optparse', 'os', 'posixpath', 'scm', 'shutil', 'sys', 'tempfile',
       'urllib',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange, members)
 
 
 class SVNUnittest(TryChangeTestsBase):
   """trychange.SVN tests."""
   def testMembersChanged(self):
     members = [
       'AutomagicalSettings', 'GclStyleSettings', 'GclientStyleSettings',
       'GetCodeReviewSetting', 'ReadRootFile',
-      'GenerateDiff', 'GetFileNames', 'GetLocalRoot',
+      'GenerateDiff', 'GetFileNames',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange.SVN, members)
 
   def testBasic(self):
     trychange.scm.SVN.GetCheckoutRoot(self.fake_root).AndReturn(self.fake_root)
     trychange.scm.SVN.GenerateDiff(['foo.txt', 'bar.txt'],
                                    self.fake_root,
                                    full_move=True,
                                    revision=None).AndReturn('A diff')
     trychange.scm.SVN.GetEmail(self.fake_root).AndReturn('georges@example.com')
     self.mox.ReplayAll()
     svn = trychange.SVN(self.options, self.fake_root)
     self.assertEqual(svn.GetFileNames(), self.expected_files)
-    self.assertEqual(svn.GetLocalRoot(), self.fake_root)
+    self.assertEqual(svn.checkout_root, self.fake_root)
     self.assertEqual(svn.GenerateDiff(), 'A diff')
 
 
 class GITUnittest(TryChangeTestsBase):
   """trychange.GIT tests."""
   def testMembersChanged(self):
     members = [
       'AutomagicalSettings', 'GclStyleSettings', 'GclientStyleSettings',
       'GetCodeReviewSetting', 'ReadRootFile',
-      'GenerateDiff', 'GetFileNames', 'GetLocalRoot',
+      'GenerateDiff', 'GetFileNames',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange.GIT, members)
 
   def testBasic(self):
     trychange.scm.GIT.GetCheckoutRoot(self.fake_root).AndReturn(self.fake_root)
     trychange.scm.GIT.GenerateDiff(self.fake_root,
                                    full_move=True,
                                    branch=None).AndReturn('A diff')
     trychange.scm.GIT.GetPatchName(self.fake_root).AndReturn('bleh-1233')
     trychange.scm.GIT.GetEmail(self.fake_root).AndReturn('georges@example.com')
     self.mox.ReplayAll()
     git = trychange.GIT(self.options, self.fake_root)
     self.assertEqual(git.GetFileNames(), self.expected_files)
-    self.assertEqual(git.GetLocalRoot(), self.fake_root)
+    self.assertEqual(git.checkout_root, self.fake_root)
     self.assertEqual(git.GenerateDiff(), 'A diff')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()