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

tests/rietveld_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 rietveld.py."""
 
 import logging
 import os
 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
 import rietveld
 from tests.patches_data import GIT, RAW
 
-# Access to a protected member XX of a client class
-# pylint: disable=W0212
-
 
 def _api(files):
   """Mock a rietveld api request."""
   return rietveld.json.dumps({'files': files})
 
 
 def _file(
     status, is_binary=False, num_chunks=1, chunk_id=789, property_changes=''):
   """Mock a file in a rietveld api request."""
   return {
       'status': status,
       'is_binary': is_binary,
       'num_chunks': num_chunks,
       'id': chunk_id,
       'property_changes': property_changes,
   }
 
 
 class RietveldTest(unittest.TestCase):
   def setUp(self):
+    super(RietveldTest, self).setUp()
+    # Access to a protected member XX of a client class
+    # pylint: disable=W0212
     self.rietveld = rietveld.Rietveld('url', 'email', 'password')
     self.rietveld._send = self._rietveld_send
     self.requests = []
 
   def tearDown(self):
     self.assertEquals([], self.requests)
+    super(RietveldTest, self).tearDown()
 
   def _rietveld_send(self, url, *args, **kwargs):
     self.assertTrue(self.requests, url)
     request = self.requests.pop(0)
     self.assertEquals(2, len(request))
     self.assertEquals(url, request[0])
     return request[1]
 
   def test_get_patch_empty(self):
     self.requests = [('/api/123/456', '{}')]
@@ skipping 283 matching lines @@
         {'foo': 'prout'},
     ]
     for i in self.rietveld.search(base='base'):
       self.assertEquals(expected.pop(0), i)
     self.assertEquals([], expected)
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=logging.ERROR)
   unittest.main()