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

Unified Diff: bin/cros_au_test_harness.py

Issue 6312069: Make git config optional to allow multiple calls to enter_chroot at the same time. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Fix 80 char Created 9 years, 11 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 | « no previous file | enter_chroot.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bin/cros_au_test_harness.py
diff --git a/bin/cros_au_test_harness.py b/bin/cros_au_test_harness.py
index 5e4faf2fe57157b8b31033b064471bb262c7da0d..67c0485ba08ea58e74a81a726eed19ff22ac7639 100755
--- a/bin/cros_au_test_harness.py
+++ b/bin/cros_au_test_harness.py
@@ -840,7 +840,10 @@ def _PregenerateUpdates(parser, options):
if src:
src = ReinterpretPathForChroot(src)
- return RunCommandCaptureOutput(['sudo',
+ return RunCommandCaptureOutput(['./enter_chroot.sh',
+ '--nogit_config',
+ '--',
+ 'sudo',
'./start_devserver',
'--pregenerate_update',
'--exit',
@@ -848,7 +851,6 @@ def _PregenerateUpdates(parser, options):
'--src_image=%s' % src,
'--for_vm',
], combine_stdout_stderr=True,
- enter_chroot=True,
print_cmd=False)
# Get the list of deltas by mocking out update method in test class.
@@ -911,9 +913,7 @@ def _RunTestsInParallel(parser, options, test_class):
threads.append(unittest.TextTestRunner().run)
args.append(test_case)
- # TODO(sosa): Set back to options.jobs once parallel generation is
- # no longer flaky.
- results = _RunParallelJobs(1, threads, args, print_status=False)
+ results = _RunParallelJobs(options.jobs, threads, args, print_status=False)
for test_result in results:
if not test_result.wasSuccessful():
Die('Test harness was not successful')
« no previous file with comments | « no previous file | enter_chroot.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698