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

tests/gclient_utils_test.py

Index: tests/gclient_utils_test.py
diff --git a/tests/gclient_utils_test.py b/tests/gclient_utils_test.py
index 3e24c01b15d4dcdf1175d1f51e6bb7124c262484..caf04b64f2893a6eabc2d4cea1a91dbaf0f7faf3 100755
--- a/tests/gclient_utils_test.py
+++ b/tests/gclient_utils_test.py
@@ -3,12 +3,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# pylint: disable=E1101,W0403
-
 import os
 import StringIO
+import sys
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-# Fixes include path.
 from super_mox import SuperMoxTestBase
 import trial_dir
 
@@ -57,6 +57,7 @@ class CheckCallAndFilterTestCase(GclientUtilBase):
         '\n________ running \'boo foo bar\' in \'bleh\'\n')
     for i in test_string:
       gclient_utils.sys.stdout.write(i)
+    # pylint: disable=E1101
     subprocess2.Popen(
         args,
         cwd=cwd,