commit 9d059dbd3f7e11f4da55dbef1f4c65e795da164d
author David James <davidjames@chromium.org> Sun Dec 30 10:04:32 2012 -0800
committer ChromeBot <chrome-bot@google.com> Wed Jan 02 13:49:50 2013 -0800
tree 661f1d0a13f476a6b6241bf581d47734f970be3a
parent 53f9a2e8a6a3490dc60b6e425c635dd03bc8e677

Update crostestutils to use chromite.lib.cros_build_lib.

crostestutils is a build-time tool and as such should be updated to use
chromite. This CL removes the 2nd last dependency on the crosutils
cros_build_lib and moves us closer to being able to remove the module.

This CL also removes the last dependency on error_ok=True support in
chromite.lib.cros_build_lib.

BUG=chromium-os:24660, chromium-os:21287
TEST=Trybot runs. Unit tests. Pylint.
TEST=Verify both successful and failed VMTest runs behave correctly.
Change-Id: Ifc53d18025707b676125603d3566215b95111fbb
Reviewed-on: https://gerrit.chromium.org/gerrit/40300
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>

lib/constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 10de5d8..be4bf21 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -8,9 +8,11 @@
 
 CROS_PLATFORM_ROOT = os.path.join(os.path.dirname(_TEST_LIB_PATH), '..', '..')
 
-SOURCE_ROOT = os.path.join(
-    os.path.dirname(_TEST_LIB_PATH), '..', '..', '..', '..')
+SOURCE_ROOT = os.path.realpath(os.path.join(
+    os.path.dirname(_TEST_LIB_PATH), '..', '..', '..', '..'))
 
-CROSUTILS_LIB_DIR = os.path.join(SOURCE_ROOT, 'src/scripts/lib')
+CROSUTILS_DIR = os.path.join(SOURCE_ROOT, 'src', 'scripts')
+
+CROSUTILS_LIB_DIR = os.path.join(CROSUTILS_DIR, 'lib')
 
 MAX_TIMEOUT_SECONDS = 2400