Use new common utils where possible.

slave/skia_slave_scripts/build_step.py

 # Copyright (c) 2013 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.
 
 """Base class for all slave-side build steps. """
 
 import config
 # pylint: disable=W0611
 import flavor_utils
 import imp
 import multiprocessing
 import os
 import shlex
 import signal
 import subprocess
 import sys
 import time
 import traceback
 
 from playback_dirs import LocalSkpPlaybackDirs
 from playback_dirs import StorageSkpPlaybackDirs
-from utils import misc
 
+BUILDBOT_PATH = os.path.realpath(os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), os.pardir, os.pardir))
 
 # Add important directories to the PYTHONPATH
-sys.path.append(os.path.join(misc.BUILDBOT_PATH, 'site_config'))
-sys.path.append(os.path.join(misc.BUILDBOT_PATH, 'master'))
+sys.path.append(os.path.join(BUILDBOT_PATH))
+sys.path.append(os.path.join(BUILDBOT_PATH, 'site_config'))
+sys.path.append(os.path.join(BUILDBOT_PATH, 'master'))
+sys.path.insert(0, os.path.join(BUILDBOT_PATH, 'common'))
 
 import builder_name_schema
 import slave_hosts_cfg
 import slaves_cfg
 
+from py.utils import misc
+
+
 DEFAULT_TIMEOUT = 4800
 DEFAULT_NO_OUTPUT_TIMEOUT = 3600
 DEFAULT_NUM_CORES = 2
 
 
 GM_EXPECTATIONS_FILENAME = 'expected-results.json'
 GM_IGNORE_FAILURES_FILE = 'ignored-tests.txt'
 
 
 # multiprocessing.Value doesn't accept boolean types, so we have to use an int.
@@ skipping 343 matching lines @@
         else:
           raise BuildStepFailure('Build step failed.')
       except Exception:
         print traceback.format_exc()
         if attempt + 1 >= step.attempts:
           raise
       # pylint: disable=W0212
       step._WaitFunc(attempt)
       attempt += 1
       print '**** %s, attempt %d ****' % (StepType.__name__, attempt + 1)