al/tiny-cloud
al/tiny-cloud
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git synced 2025-12-18 12:52:42 +03:00
Code Packages Wiki

Unhide imds error messages

Browse Source 
imds drivers may print error messages to stderr. Do not hide those.
This commit is contained in:
Natanael Copa 2023-05-17 14:10:51 +02:00
parent c4d2592e41
commit a90bf444d3
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/imds
View File

@ -122,7 +122,7 @@ imds() {
*) args="$key" ;; *) args="$key" ;;
esac esac
# TODO: retry/deadline # TODO: retry/deadline
"$cmd" $args 2>/dev/null "$cmd" $args
rv=$? rv=$?
[ $err -eq 0 ] && continue [ $err -eq 0 ] && continue
[ $rv = "0" ] || return $rv [ $rv = "0" ] || return $rv

2
tests/init-final.test
View File

@ -48,7 +48,7 @@ run_userdata_body() {
#!/bin/sh #!/bin/sh
echo "hello from user-data" echo "hello from user-data"
EOF EOF
CLOUD="nocloud" atf_check \ CLOUD="nocloud" atf_check -e match:"NoCloud 'meta-data' is empty" \
sh -c ". \"$lib\"; init__save_userdata" sh -c ". \"$lib\"; init__save_userdata"
CLOUD="nocloud" atf_check \ CLOUD="nocloud" atf_check \
-o match:"hello from user-data" \ -o match:"hello from user-data" \

2
tests/init-main.test
View File

@ -69,7 +69,7 @@ save_userdata_plain_body() {
fake_userdata_nocloud <<-EOF fake_userdata_nocloud <<-EOF
#userdata #userdata
EOF EOF
CLOUD="nocloud" atf_check \ CLOUD="nocloud" atf_check -e match:"NoCloud 'meta-data' is empty" \
sh -c ". \"$lib\"; init__save_userdata" sh -c ". \"$lib\"; init__save_userdata"
atf_check -o match:"^#userdata" cat var/lib/cloud/user-data atf_check -o match:"^#userdata" cat var/lib/cloud/user-data
} }