Use new common utils where possible.

slave/skia_slave_scripts/utils/gs_utils_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Tests for module gs_utils."""
 
 import __builtin__
-import misc
 import os
 import posixpath
-import shell_utils
 import shutil
 import sys
 import tempfile
 import time
 
 # Appending to PYTHONPATH to find common.
-sys.path.append(os.path.join(misc.BUILDBOT_PATH, 'third_party',
-                             'chromium_buildbot', 'scripts'))
-sys.path.append(os.path.join(misc.BUILDBOT_PATH, 'third_party',
-                             'chromium_buildbot', 'scripts', 'common'))
-sys.path.append(os.path.join(misc.BUILDBOT_PATH, 'third_party',
-                             'chromium_buildbot', 'site_config'))
-sys.path.append(os.path.join(misc.BUILDBOT_PATH, 'third_party',
-                             'chromium_buildbot', 'third_party',
-                             'twisted_10_2'))
+BUILDBOT_PATH = os.path.realpath(os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), os.pardir, os.pardir, os.pardir)
+)
+sys.path.append(os.path.join(BUILDBOT_PATH, 'common'))
+sys.path.append(os.path.join(BUILDBOT_PATH, 'third_party', 'chromium_buildbot',
+                             'scripts'))
+sys.path.append(os.path.join(BUILDBOT_PATH, 'third_party', 'chromium_buildbot',
+                             'scripts', 'common'))
+sys.path.append(os.path.join(BUILDBOT_PATH, 'third_party', 'chromium_buildbot',
+                             'site_config'))
+sys.path.append(os.path.join(BUILDBOT_PATH, 'third_party', 'chromium_buildbot',
+                             'third_party', 'twisted_10_2'))
 
-
+from py.utils import shell_utils
 from slave import slave_utils
 import gs_utils
 import unittest
 
 
 GSUTIL_LOCATION = slave_utils.GSUtilSetup()
 
 TEST_TIMESTAMP = '1354128965'
 TEST_TIMESTAMP_2 = '1354128985'
 
@@ skipping 175 matching lines @@
     # pylint: disable=W0212
     self.assertFalse(
         gs_utils._are_timestamps_equal(
             local_dir=local_dir,
             gs_base=self._test_gs_base,
             gs_relative_dir=self._test_destdir))
 
 
 if __name__ == '__main__':
   unittest.main()