Use new common utils where possible.

slave/skia_slave_scripts/utils/gs_utils_test.py

Index: slave/skia_slave_scripts/utils/gs_utils_test.py
diff --git a/slave/skia_slave_scripts/utils/gs_utils_test.py b/slave/skia_slave_scripts/utils/gs_utils_test.py
index 0a226e1cea559ac6f522e9ebc26ed49ff737e01d..aa86c26b1a99c19cdf3224b2cc385d70b36eae40 100644
--- a/slave/skia_slave_scripts/utils/gs_utils_test.py
+++ b/slave/skia_slave_scripts/utils/gs_utils_test.py
@@ -6,27 +6,28 @@
 """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