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

tests/patch_test.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 patch.py."""
 
 import logging
 import os
 import posixpath
 import sys
 import unittest
 
-ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, os.path.join(ROOT_DIR, '..'))
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import patch
 from tests.patches_data import GIT, RAW
 
 
 class PatchTest(unittest.TestCase):
   def _check_patch(self,
       p,
       filename,
       diff,
@@ skipping 59 matching lines @@
     p = patch.FilePatchDiff('foo', RAW.NEW, [])
     self._check_patch(p, 'foo', RAW.NEW, is_new=True)
 
   def testFilePatchDiffGitNew(self):
     # The code path is different for git and svn.
     p = patch.FilePatchDiff('foo', GIT.NEW, [])
     self._check_patch(
         p, 'foo', GIT.NEW, is_new=True, is_git_diff=True, patchlevel=1)
 
   def testValidSvn(self):
-    # pylint: disable=R0201
-    # Method could be a function
     # Should not throw.
     p = patch.FilePatchDiff('chrome/file.cc', RAW.PATCH, [])
     lines = RAW.PATCH.splitlines(True)
     header = ''.join(lines[:4])
     hunks = ''.join(lines[4:])
     self.assertEquals(header, p.diff_header)
     self.assertEquals(hunks, p.diff_hunks)
     self.assertEquals(RAW.PATCH, p.get(True))
     self.assertEquals(RAW.PATCH, p.get(False))
 
@@ skipping 347 matching lines @@
       self.fail()
     except patch.UnsupportedPatchFormat:
       pass
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=
       [logging.WARNING, logging.INFO, logging.DEBUG][
         min(2, sys.argv.count('-v'))])
   unittest.main()