tests: adjust to openssl 3

openssl3 have different output to stderr when generating keys. Adjust
accordingly.
This commit is contained in:
Natanael Copa 2022-08-05 15:19:21 +02:00
parent fd6002b277
commit 3a235e4d3c
1 changed files with 6 additions and 6 deletions

View File

@ -39,7 +39,7 @@ abuild_keygen_invalid_arg_body() {
abuild_keygen_non_interactive_body() {
atf_check -s exit:0 \
-o empty \
-e match:"Generating RSA.*4096" \
-e match:"(Generating|writing) RSA" \
abuild-keygen -n
}
@ -48,7 +48,7 @@ abuild_keygen_append_body() {
atf_check -s exit:0 \
\
-o empty \
-e match:"Generating RSA" \
-e match:"(Generating|writing) RSA" \
abuild-keygen --append -n
grep '^PACKAGER_PRIVKEY=.*user@example.com' "$HOME"/.abuild/abuild.conf \
|| atf_fail 'PACKAGER_PRIVKEY not set in abuild.conf'
@ -59,7 +59,7 @@ abuild_keygen_install_without_sudo_body() {
atf_check -s exit:1 \
\
-o empty \
-e match:"Generating RSA" \
-e match:"(Generating|writing) RSA" \
abuild-keygen --install -n
}
@ -68,7 +68,7 @@ abuild_keygen_install_interactive_body() {
atf_check -s exit:0 \
\
-o match:"Enter file" \
-e match:"Generating RSA" \
-e match:"(Generating|writing) RSA" \
abuild-keygen --install
}
@ -77,7 +77,7 @@ abuild_keygen_install_non_interactive_body() {
atf_check -s exit:0 \
\
-o empty \
-e match:"Generating RSA" \
-e match:"(Generating|writing) RSA" \
abuild-keygen --install -n
}
@ -94,7 +94,7 @@ abuild_keygen_install_doas_body() {
atf_check -s exit:0 \
\
-o match:"fake doas" \
-e match:"Generating RSA" \
-e match:"(Generating|writing) RSA" \
abuild-keygen --install -n
}