Standardize the sys.path fix up and fix a few pylint warnings.

tests/trychange_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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."""
 
-# pylint: disable=E1103,W0403
+import os
+import sys
 
-# Fixes include path.
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
 from super_mox import SuperMoxTestBase
 
 import subprocess2
 import trychange
 
 
 class TryChangeTestsBase(SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     SuperMoxTestBase.setUp(self)
@@ skipping 63 matching lines @@
   """trychange.GIT tests."""
   def testMembersChanged(self):
     members = [
       'AutomagicalSettings', 'CaptureStatus', 'GetCodeReviewSetting',
       'ReadRootFile', 'GenerateDiff', 'GetFileNames', 'files', 'file_tuples',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(trychange.GIT, members)
 
   def testBasic(self):
+    # pylint: disable=E1103
     trychange.os.path.abspath(self.fake_root).AndReturn(self.fake_root)
     trychange.scm.GIT.GetCheckoutRoot(self.fake_root).AndReturn(self.fake_root)
     trychange.scm.GIT.GetUpstreamBranch(self.fake_root).AndReturn('somewhere')
     trychange.scm.GIT.GenerateDiff(self.fake_root,
                                    full_move=True,
                                    files=['foo.txt', 'bar.txt'],
                                    branch='somewhere').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.options.files)
     self.assertEqual(git.GetFileNames(), self.expected_files)
     self.assertEqual(git.checkout_root, self.fake_root)
     self.assertEqual(git.GenerateDiff(), 'A diff')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()