From 16d971956e2c84c8674b222556048c7a573c5a3f Mon Sep 17 00:00:00 2001 From: Tim Kimber Date: Tue, 22 Mar 2022 16:47:26 +0000 Subject: [PATCH] Add prefix to 'warning' in the update message so tests don't fail --- getssl | 6 ++++-- test/test_helper.bash | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/getssl b/getssl index c02bb6c..e8dae2a 100755 --- a/getssl +++ b/getssl @@ -283,7 +283,7 @@ # 2021-12-22 Don't show usage if run with --upgrade (#728) # 2021-12-23 Don't use +idnout if dig shows a warning (#688) # 2022-01-06 Support --account-id (#716)(2.46) -# 2022-03-09 Support for ISPConfig API (2.47) +# 2022-03-09 Support for ISPConfig API # ---------------------------------------------------------------------------------------- case :$SHELLOPTS: in @@ -803,7 +803,9 @@ check_getssl_upgrade() { # check if a more recent release is available error_exit "curl error checking releases: $errcode" fi # Replace error in release description with _error (which is ignored by check_output_for_errors() in the tests) - debug "${release_data//error/_error}" + sanitised_release_data=${release_data//error/_error} + sanitised_release_data=${sanitised_release_data//warning/_warning} + debug "${sanitised_release_data//error/_error}" # awk from https://stackoverflow.com/questions/1761341/awk-print-next-record-following-matched-record release_tag=$(awk -F'"' '/tag_name/ {f=NR} f&&NR-1==f' RS=":|," <<<"${release_data}" | sed -e's/"//g') if [[ "${release_tag:0:1}" != 'v' ]] ; then diff --git a/test/test_helper.bash b/test/test_helper.bash index 92d15ca..1d82a66 100644 --- a/test/test_helper.bash +++ b/test/test_helper.bash @@ -25,7 +25,7 @@ check_nginx() { check_output_for_errors() { refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]' refute_output --regexp '[^_][Ee][Rr][Rr][Oo][Rr][^:nonce]' - refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]' + refute_output --regexp '[^_][Ww][Aa][Rr][Nn][Ii][Nn][Gg]' refute_line --partial 'command not found' }