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

tests/checkout_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 checkout.py."""
 
 from __future__ import with_statement
 import logging
 import os
 import shutil
 import sys
 import unittest
 from xml.etree import ElementTree
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
-BASE_DIR = os.path.join(ROOT_DIR, '..')
-sys.path.insert(0, BASE_DIR)
+sys.path.insert(0, os.path.dirname(ROOT_DIR))
 
 import checkout
 import patch
 import subprocess2
 from tests import fake_repos
 from tests.patches_data import GIT, RAW
 
 
 # pass -v to enable it.
 DEBUGGING = False
@@ skipping 549 matching lines @@
   if '-v' in sys.argv:
     DEBUGGING = True
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   else:
     logging.basicConfig(
         level=logging.ERROR,
         format='%(levelname)5s %(filename)15s(%(lineno)3d): %(message)s')
   unittest.main()