combine base_unittest.py modules from gm and tools

gm/rebaseline_server/compare_configs_test.py

Index: gm/rebaseline_server/compare_configs_test.py
diff --git a/gm/rebaseline_server/compare_configs_test.py b/gm/rebaseline_server/compare_configs_test.py
index 756af6615649506c414c016d87a5e61c955d1c78..0c701e44bfac551a29db1150e9a14203cc1bd803 100755
--- a/gm/rebaseline_server/compare_configs_test.py
+++ b/gm/rebaseline_server/compare_configs_test.py
@@ -10,22 +10,25 @@ Test compare_configs.py
 
 TODO(epoger): Create a command to update the expected results (in
 self._output_dir_expected) when appropriate.  For now, you should:
-1. examine the results in self._output_dir_actual and make sure they are ok
+1. examine the results in self.output_dir_actual and make sure they are ok
 2. rm -rf self._output_dir_expected
-3. mv self._output_dir_actual self._output_dir_expected
+3. mv self.output_dir_actual self._output_dir_expected
 Although, if you're using an SVN checkout, this will blow away .svn directories
 within self._output_dir_expected, which wouldn't be good...
 
 """
 
+# System-level imports
 import os
-import sys
+
+# Must fix up PYTHONPATH before importing from within Skia
+import fix_pythonpath  # pylint: disable=W0611
 
 # Imports from within Skia
 import base_unittest
 import compare_configs
+import gm_json
 import results
-import gm_json  # must import results first, so that gm_json will be in sys.path
 
 
 class CompareConfigsTest(base_unittest.TestCase):
@@ -34,14 +37,14 @@ class CompareConfigsTest(base_unittest.TestCase):
     """Process results of a GM run with the ConfigComparisons object."""
     results_obj = compare_configs.ConfigComparisons(
         configs=('8888', 'gpu'),
-        actuals_root=os.path.join(self._input_dir, 'gm-actuals'),
-        generated_images_root=self._temp_dir,
+        actuals_root=os.path.join(self.input_dir, 'gm-actuals'),
+        generated_images_root=self.temp_dir,
         diff_base_url='/static/generated-images')
     results_obj.get_timestamp = mock_get_timestamp
     gm_json.WriteToFile(
         results_obj.get_packaged_results_of_type(
             results.KEY__HEADER__RESULTS_ALL),
-        os.path.join(self._output_dir_actual, 'gm.json'))
+        os.path.join(self.output_dir_actual, 'gm.json'))
 
 
 def mock_get_timestamp():