From f6e26cd42c13a5e030513e3d6fa2cf14d0a1d1e8 Mon Sep 17 00:00:00 2001 From: Richard Bonhomme Date: Fri, 7 Jun 2019 14:38:38 +0100 Subject: [PATCH 1/2] Improve op_test.sh: make wait_sec variable; Add server with SAN renew test. Signed-off-by: Richard Bonhomme --- op_test.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/op_test.sh b/op_test.sh index f04784d..504c130 100755 --- a/op_test.sh +++ b/op_test.sh @@ -163,7 +163,8 @@ verb_off () wait_sec () { - ( sleep 4 2>/dev/null ) || { ( ping -n 1 127.0.0.1 2>/dev/null ) && ping -n 3 127.0.0.1; } + delay=${1:-3} + ( sleep $delay 2>/dev/null ) || { ( ping -n 1 127.0.0.1 2>/dev/null ) && ping -n $delay 127.0.0.1; } } setup () @@ -370,7 +371,7 @@ build_full () build_san_full () { newline 1 - STEP_NAME="--subject-alt-name=IP:0.0.0.0 build-server-full $REQ_name nopass" + STEP_NAME="--subject-alt-name=DNS:www.example.org,IP:0.0.0.0 build-server-full $REQ_name nopass" action secure_key } @@ -480,6 +481,9 @@ create_pki () REQ_name="s02" build_san_full show_cert + wait_sec + renew_cert + show_cert revoke_cert REQ_type="serverClient" From fbb5e30858741c4536ad12bbf87e09ac46e1b0c5 Mon Sep 17 00:00:00 2001 From: Richard Bonhomme Date: Fri, 7 Jun 2019 14:51:33 +0100 Subject: [PATCH 2/2] op_test.sh: adhere to shellcheck Signed-off-by: Richard Bonhomme --- op_test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/op_test.sh b/op_test.sh index 504c130..13c1740 100755 --- a/op_test.sh +++ b/op_test.sh @@ -472,7 +472,7 @@ create_pki () REQ_name="s01" build_full show_cert - wait_sec + wait_sec 3 renew_cert show_cert revoke_cert @@ -481,7 +481,7 @@ create_pki () REQ_name="s02" build_san_full show_cert - wait_sec + wait_sec 3 renew_cert show_cert revoke_cert @@ -496,7 +496,7 @@ create_pki () REQ_name="c01" build_full show_cert - wait_sec + wait_sec 3 renew_cert show_cert revoke_cert