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

Unified Diff: ctest/ctest.py

Issue 6815003: This CL updates the parallel job library in the au test harness to be more robust. (Closed) Base URL: http://git.chromium.org/git/crostestutils.git@master
Patch Set: Don's feedback Created 9 years, 8 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/vm_au_worker.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ctest/ctest.py
diff --git a/ctest/ctest.py b/ctest/ctest.py
index 7799a1d862b7ec4cdc9ee0e1057cf70665d683d6..ed11019cac5cb5c37797c0a3ddb9326c1f83ad7f 100755
--- a/ctest/ctest.py
+++ b/ctest/ctest.py
@@ -283,8 +283,9 @@ def RunAUTestHarness(board, channel, zip_server_base,
update_engine_path = os.path.join(crosutils_root, '..', 'platform',
'update_engine')
- private_key_path = os.path.join(update_engine_path, 'unittest_key.pem')
- public_key_path = GeneratePublicKey(private_key_path)
+ if clean:
+ private_key_path = os.path.join(update_engine_path, 'unittest_key.pem')
+ public_key_path = GeneratePublicKey(private_key_path)
cmd = ['bin/cros_au_test_harness',
'--base_image=%s' % base_image,
@@ -292,12 +293,14 @@ def RunAUTestHarness(board, channel, zip_server_base,
'--board=%s' % board,
'--type=%s' % type,
'--remote=%s' % remote,
- '--private_key=%s' % private_key_path,
- '--public_key=%s' % public_key_path,
]
if test_results_root: cmd.append('--test_results_root=%s' % test_results_root)
if no_graphics: cmd.append('--no_graphics')
- if clean: cmd.append('--clean')
+ # Using keys is only compatible with clean.
+ if clean:
+ cmd.append('--clean')
+ cmd.append('--private_key=%s' % private_key_path)
+ cmd.append('--public_key=%s' % public_key_path)
cros_lib.RunCommand(cmd, cwd=crosutils_root)
« no previous file with comments | « au_test_harness/vm_au_worker.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698