diff options
author | Peter Eckersley <pde@eff.org> | 2016-10-06 23:49:40 +0300 |
---|---|---|
committer | Peter Eckersley <pde@eff.org> | 2016-10-06 23:49:40 +0300 |
commit | 6056bf5eaff295a04288056f46ecc79199afe794 (patch) | |
tree | ad7dabe5409f2a33a8044362c192bb75602236c3 | |
parent | 37f7ee44d1670d206b53cd6e84fd2f82b7a9d1ee (diff) |
Make implementation legiblequietude-integration
-rwxr-xr-x | tests/boulder-integration.sh | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh index 5ba6cc938..9864393c1 100755 --- a/tests/boulder-integration.sh +++ b/tests/boulder-integration.sh @@ -59,24 +59,22 @@ CheckCertCount() { } CheckCertCount 1 + +AssertCommandIsSilent() { + set +x + OUT=`$@ 2>&1` + set -x + if [ "$OUT" != "" ] ; then + echo $@ produced non-empty output: "$OUT" + exit 1 + fi +} # This won't renew (because it's not time yet) -set +x -OUT=`common_no_force_renew renew --quiet 2>&1` -set -x -if [ "$OUT" != "" ] ; then - echo Renew --quiet produced non-empty output: "$OUT" - exit 1 -fi +AssertCommandIsSilent common_no_force_renew renew --quiet CheckCertCount 1 # --renew-by-default is used, so renewal should occur -set +x -OUT=`common renew --quiet -vvv 2>&1` -set -x -if [ "$OUT" != "" ] ; then - echo Renew --quiet -vvv --force-renew produced non-empty output: "$OUT" - exit 1 -fi +AssertCommandIsSilent common renew --quiet -vvv CheckCertCount 2 # This will renew because the expiry is less than 10 years from now |