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

tests/gcl_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 gcl.py."""
 
-# pylint is too confused.
-# pylint: disable=E1101,E1103,E1120,W0212,W0403
+# pylint: disable=E1103,E1101,E1120
 
-# Fixes include path.
+import os
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
 from super_mox import mox, SuperMoxTestBase
 
 import gcl
 import presubmit_support
 
 
 class GclTestsBase(SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     SuperMoxTestBase.setUp(self)
@@ skipping 151 matching lines @@
     GclTestsBase.setUp(self)
     self.mox.StubOutWithMock(gcl, 'GetChangelistInfoFile')
     self.mox.StubOutWithMock(gcl, 'GetRepositoryRoot')
 
   def testChangeInfoMembers(self):
     self.mox.ReplayAll()
     members = [
       'CloseIssue', 'Delete', 'Exists', 'GetFiles', 'GetFileNames',
       'GetLocalRoot', 'GetIssueDescription', 'Load', 'MissingTests',
       'NeedsUpload', 'PrimeLint', 'RpcServer', 'Save', 'SendToRietveld',
+      'SEPARATOR',
       'UpdateRietveldDescription',
       'description', 'issue', 'name',
       'needs_upload', 'patch', 'patchset', 'reviewers', 'rietveld',
       'subject',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(
         gcl.ChangeInfo('', 0, 0, '', None, self.fake_root_dir, 'foo', False),
         members)
 
@@ skipping 17 matching lines @@
     self.assertEquals(o.GetFileNames(), ['foo', 'bar'])
     self.assertEquals(o.GetFiles(), files)
     self.assertEquals(o.GetLocalRoot(), self.fake_root_dir)
 
   def testLoadWithIssue(self):
     self.mox.StubOutWithMock(gcl, 'GetCodeReviewSetting')
     description = ["This is some description.", "force an extra separator."]
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.os.path.exists('bleeeh').AndReturn(True)
     gcl.gclient_utils.FileRead('bleeeh').AndReturn(
-      gcl.ChangeInfo._SEPARATOR.join(["42, 53", "G      b.cc"] + description))
+      gcl.ChangeInfo.SEPARATOR.join(["42, 53", "G      b.cc"] + description))
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('foo')
     # Does an upgrade.
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.gclient_utils.FileWrite('bleeeh', mox.IgnoreArg())
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo.Load('bleh', self.fake_root_dir, True, False)
     self.assertEquals(change_info.name, 'bleh')
     self.assertEquals(change_info.issue, 42)
     self.assertEquals(change_info.patchset, 53)
     self.assertEquals(change_info.description,
-                      gcl.ChangeInfo._SEPARATOR.join(description))
+                      gcl.ChangeInfo.SEPARATOR.join(description))
     self.assertEquals(change_info.GetFiles(), [('G      ', 'b.cc')])
 
   def testLoadEmpty(self):
     self.mox.StubOutWithMock(gcl, 'GetCodeReviewSetting')
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.os.path.exists('bleeeh').AndReturn(True)
     gcl.gclient_utils.FileRead('bleeeh').AndReturn(
-        gcl.ChangeInfo._SEPARATOR.join(["", "", ""]))
+        gcl.ChangeInfo.SEPARATOR.join(["", "", ""]))
     gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('foo')
     # Does an upgrade.
     gcl.GetChangelistInfoFile('bleh').AndReturn('bleeeh')
     gcl.gclient_utils.FileWrite('bleeeh', mox.IgnoreArg())
     self.mox.ReplayAll()
 
     change_info = gcl.ChangeInfo.Load('bleh', self.fake_root_dir, True, False)
     self.assertEquals(change_info.name, 'bleh')
     self.assertEquals(change_info.issue, 0)
     self.assertEquals(change_info.patchset, 0)
@@ skipping 308 matching lines @@
     self.mockPresubmit(change_info, fail=False)
     self.mockCommit(change_info, 'deescription\nReview URL: http://my_server/1',
                     '')
 
     self.mox.ReplayAll()
 
     retval = gcl.CMDcommit(['naame'])
 
     self.assertEquals(retval, 0)
     self.assertEquals(change_info.description, 'deescription')
+    # pylint: disable=W0212
     self.assertFalse(change_info._deleted)
     self.assertFalse(change_info._closed)
 
   def testPresubmitSucceedsWithCommittedMessage(self):
     change_info = self.mockLoad()
     self.mockPresubmit(change_info, fail=False)
     self.mockCommit(change_info, 'deescription\nReview URL: http://my_server/1',
                     '\nCommitted revision 12345')
 
     self.mox.ReplayAll()
 
     retval = gcl.CMDcommit(['naame'])
     self.assertEquals(retval, 0)
     self.assertEquals(change_info.description,
         'deescription\n\nCommitted: http://view/12345')
+    # pylint: disable=W0212
     self.assertTrue(change_info._deleted)
     self.assertTrue(change_info._closed)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()