From be7adfa7f222f0e66da0821634998f47f197af51 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 8 Jul 2015 15:34:09 -0400 Subject: [PATCH] Display puppet apply results right after running Otherwise, there is a case where the results are not rendered properly because the shell exits. Change-Id: Ica05615cad4fcc15c9d941d16f74cb4f68bc5a99 Signed-off-by: Paul Belanger --- tools/apply-test.sh | 2 -- tools/test_puppet_apply.sh | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/apply-test.sh b/tools/apply-test.sh index 3231300c6d..305ffccb62 100755 --- a/tools/apply-test.sh +++ b/tools/apply-test.sh @@ -105,5 +105,3 @@ find applytest -name 'puppetapplytest*.final' -print0 find applytest -name 'puppetapplytest*.final' -print0 | \ xargs -0 -P $(nproc) -n 1 -I filearg \ ./tools/test_puppet_apply.sh filearg - -cat applytest/*.out diff --git a/tools/test_puppet_apply.sh b/tools/test_puppet_apply.sh index ec15a45d12..69f08735fb 100755 --- a/tools/test_puppet_apply.sh +++ b/tools/test_puppet_apply.sh @@ -20,4 +20,5 @@ echo "##" > $fileout cat $file > $fileout sudo puppet apply --modulepath=${MODULE_PATH} --color=false --noop --verbose --debug $file >/dev/null 2>> $fileout ret=$? +cat $fileout exit $ret