From 3b460cea7189a8d392c0b014e14780300b43235d Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Thu, 5 Jan 2017 11:40:59 -0800 Subject: [PATCH] cleanup test scripts --- .../test_letsencrypt_auto_certonly_standalone.sh | 10 +++++----- tests/letstest/scripts/test_ocsp_experimental.sh | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh b/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh index f3c585908..9b5ff88a2 100755 --- a/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh +++ b/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh @@ -23,16 +23,16 @@ cd tests/letstest/testdata/ # 2. refer to the config with the same level of relativitity that it itself # contains :/ -letsencrypt-auto certificates --config-dir sample-config -TEST_CERTS=`letsencrypt-auto certificates --config-dir sample-config | grep TEST_CERT | wc -l` -REVOKED=`letsencrypt-auto certificates --config-dir sample-config | grep REVOKED | wc -l` +OUT=`letsencrypt-auto certificates --config-dir sample-config -v` +TEST_CERTS=`echo "$OUT" | grep TEST_CERT | wc -l` +REVOKED=`echo "$OUT" | grep REVOKED | wc -l` if [ "$TEST_CERTS" != 2 ] ; then - echo Did not find two test certs as expected ("$TEST_CERTS") + echo "Did not find two test certs as expected ($TEST_CERTS)" exit 1 fi if [ "$REVOKED" != 1 ] ; then - echo Did not find one revoked cert as expected ("$REVOKED") + echo "Did not find one revoked cert as expected ($REVOKED)" exit 1 fi diff --git a/tests/letstest/scripts/test_ocsp_experimental.sh b/tests/letstest/scripts/test_ocsp_experimental.sh index 11bf8885d..50be6012f 100755 --- a/tests/letstest/scripts/test_ocsp_experimental.sh +++ b/tests/letstest/scripts/test_ocsp_experimental.sh @@ -24,16 +24,16 @@ cd tests/letstest/testdata/ # 2. refer to the config with the same level of relativitity that it itself # contains :/ -sudo ../../../venv/bin/certbot certificates -v --config-dir sample-config -TEST_CERTS=`sudo ../../../venv/bin/certbot certificates --config-dir sample-config | grep TEST_CERT | wc -l` -REVOKED=`sudo ../../../venv/bin/certbot certificates --config-dir sample-config | grep REVOKED | wc -l` +OUT=`../../../venv/bin/certbot certificates -v --config-dir sample-config` +TEST_CERTS=`echo "$OUT" | grep TEST_CERT | wc -l` +REVOKED=`echo "$OUT" | grep REVOKED | wc -l` -if [ "$TEST_CERTS" -ne 2 ] ; then - echo Did not find two test certs as expected ("$TEST_CERTS") +if [ "$TEST_CERTS" != 2 ] ; then + echo "Did not find two test certs as expected ($TEST_CERTS)" exit 1 fi -if [ "$REVOKED" -ne 1 ] ; then - echo Did not find one revoked cert as expected ("$REVOKED") +if [ "$REVOKED" != 1 ] ; then + echo "Did not find one revoked cert as expected ($REVOKED)" exit 1 fi