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

tests/subprocess2_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 subprocess2.py."""
 
 import logging
 import optparse
 import os
 import sys
 import time
 import unittest
 
 try:
   import fcntl
 except ImportError:
   fcntl = None
 
-ROOT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-sys.path.insert(0, ROOT_DIR)
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import subprocess2
 
-# Method could be a function
-# pylint: disable=R0201
-
 
 def convert_to_crlf(string):
   """Unconditionally convert LF to CRLF."""
   return string.replace('\n', '\r\n')
 
 
 def convert_to_cr(string):
   """Unconditionally convert LF to CR."""
   return string.replace('\n', '\r')
 
@@ skipping 39 matching lines @@
 
   @staticmethod
   def _fake_Popen():
     results = {}
     class fake_Popen(object):
       returncode = -8
       def __init__(self, args, **kwargs):
         assert not results
         results.update(kwargs)
         results['args'] = args
-      def communicate(self):
+      @staticmethod
+      def communicate():
         return None, None
     subprocess2.Popen = fake_Popen
     return results
 
   @staticmethod
   def _fake_subprocess_Popen():
     results = {}
     class fake_Popen(object):
       returncode = -8
       def __init__(self, args, **kwargs):
         assert not results
         results.update(kwargs)
         results['args'] = args
-      def communicate(self):
+      @staticmethod
+      def communicate():
         return None, None
     subprocess2.subprocess.Popen = fake_Popen
     return results
 
   def test_check_call_defaults(self):
     results = self._fake_communicate()
     self.assertEquals(
         ['stdout', 'stderr'], subprocess2.check_call_out(['foo'], a=True))
     expected = {
         'args': ['foo'],
@@ skipping 338 matching lines @@
   return options.return_value
 
 
 if __name__ == '__main__':
   logging.basicConfig(level=
       [logging.WARNING, logging.INFO, logging.DEBUG][
         min(2, sys.argv.count('-v'))])
   if len(sys.argv) > 1 and sys.argv[1] == '--child':
     sys.exit(child_main(sys.argv[2:]))
   unittest.main()