Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(883)

Unified Diff: au_test_harness/cros_au_test_harness.py

Issue 6736023: Install test scripts into chroot. (Closed) Base URL: http://git.chromium.org/git/crostestutils.git@master
Patch Set: Remove vm scripts from makefile Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « au_test_harness/au_worker.py ('k') | au_test_harness/dev_server_wrapper.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: au_test_harness/cros_au_test_harness.py
diff --git a/au_test_harness/cros_au_test_harness.py b/au_test_harness/cros_au_test_harness.py
index 7aed0f7054a7f61063d8e3d511409145d4710d21..9b7be822c833f1d505dc51015a4819249c78f1b3 100755
--- a/au_test_harness/cros_au_test_harness.py
+++ b/au_test_harness/cros_au_test_harness.py
@@ -53,9 +53,7 @@ def _PregenerateUpdates(options):
"""
def _GenerateVMUpdate(target, src, private_key_path):
"""Generates an update using the devserver."""
- command = ['./enter_chroot.sh',
- '--',
- 'sudo',
+ command = ['sudo',
'start_devserver',
'--pregenerate_update',
'--exit',
@@ -70,7 +68,9 @@ def _PregenerateUpdates(options):
cros_lib.ReinterpretPathForChroot(private_key_path))
return cros_lib.RunCommandCaptureOutput(command, combine_stdout_stderr=True,
- print_cmd=True)
+ enter_chroot=True,
+ print_cmd=True,
+ cwd=cros_lib.GetCrosUtilsPath())
# Use dummy class to mock out updates that would be run as part of a test.
test_suite = _PrepareTestSuite(options, use_dummy_worker=True)
@@ -168,7 +168,8 @@ def _CleanPreviousWork(options):
# Wipe devserver cache.
cros_lib.RunCommandCaptureOutput(
['sudo', 'start_devserver', '--clear_cache', '--exit', ],
- enter_chroot=True, print_cmd=False, combine_stdout_stderr=True)
+ enter_chroot=True, print_cmd=False, combine_stdout_stderr=True,
+ cwd=cros_lib.GetCrosUtilsPath())
# Clean previous vm images if they exist.
if options.type == 'vm':
« no previous file with comments | « au_test_harness/au_worker.py ('k') | au_test_harness/dev_server_wrapper.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698