diff options
| author | Brad Warren <bmw@users.noreply.github.com> | 2017-01-27 01:08:22 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 01:08:22 +0300 |
| commit | fe03c5a14c472f117eff039bd066e3019e131d53 (patch) | |
| tree | 2ae36179a3a773f9e6f999e8d769f1bee3669242 /tests/boulder-integration.sh | |
| parent | 4e297b02482d9df22a4bc4808d7a901dddfa0412 (diff) | |
fix integration tests (#4111)
Diffstat (limited to 'tests/boulder-integration.sh')
| -rwxr-xr-x | tests/boulder-integration.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh index 930cf1c0e..5a1f88c8a 100755 --- a/tests/boulder-integration.sh +++ b/tests/boulder-integration.sh @@ -47,23 +47,24 @@ common() { export HOOK_TEST="/tmp/hook$$" CheckHooks() { - COMMON="wtf2.auth\nwtf2.cleanup\nrenew\nrenew" EXPECTED="/tmp/expected$$" if [ $(head -n1 $HOOK_TEST) = "wtf.pre" ]; then echo "wtf.pre" > "$EXPECTED" echo "wtf2.pre" >> "$EXPECTED" - echo $COMMON >> "$EXPECTED" + echo "renew" >> "$EXPECTED" + echo "renew" >> "$EXPECTED" echo "wtf.post" >> "$EXPECTED" echo "wtf2.post" >> "$EXPECTED" else echo "wtf2.pre" > "$EXPECTED" echo "wtf.pre" >> "$EXPECTED" - echo $COMMON >> "$EXPECTED" + echo "renew" >> "$EXPECTED" + echo "renew" >> "$EXPECTED" echo "wtf2.post" >> "$EXPECTED" echo "wtf.post" >> "$EXPECTED" fi - if cmp --quiet "$EXPECTED" "$HOOK_TEST" ; then + if ! cmp --quiet "$EXPECTED" "$HOOK_TEST" ; then echo Hooks did not run as expected\; got cat "$HOOK_TEST" echo Expected @@ -91,8 +92,8 @@ common --domains le2.wtf --preferred-challenges http-01 run \ kill $python_server_pid common certonly -a manual -d le.wtf --rsa-key-size 4096 \ - --manual-auth-hook 'echo wtf2.auth >> "$HOOK_TEST" && ./tests/manual-http-auth.sh' \ - --manual-cleanup-hook 'echo wtf2.cleanup >> "$HOOK_TEST" && ./tests/manual-http-cleanup.sh' \ + --manual-auth-hook ./tests/manual-http-auth.sh \ + --manual-cleanup-hook ./tests/manual-http-cleanup.sh \ --pre-hook 'echo wtf2.pre >> "$HOOK_TEST"' \ --post-hook 'echo wtf2.post >> "$HOOK_TEST"' |