From 35e076dc3dfc083b63bd0be99c6a8e6283784840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jake=20Buchholz=20G=C3=B6kt=C3=BCrk?= Date: Sat, 13 May 2023 14:50:40 -0700 Subject: [PATCH] * moar fixens? --- tests/init-main.test | 1 - tests/tiny-cloud-alpine.test | 2 +- tests/tiny-cloud.test | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/init-main.test b/tests/init-main.test index e9ce77a..0cfe770 100755 --- a/tests/init-main.test +++ b/tests/init-main.test @@ -76,7 +76,6 @@ save_userdata_plain_body() { save_userdata_compressed_body() { for comp in gzip bzip2 xz lzma lzop lz4 zstd; do # fake_userdata_nocloud will set PATH so dont run it in a subshell - rm -f var/lib/cloud/user-data printf "%s\n" "#userdata" | $comp -c > tmpfile fake_userdata_nocloud < tmpfile diff --git a/tests/tiny-cloud-alpine.test b/tests/tiny-cloud-alpine.test index 9713ee9..0ef1437 100755 --- a/tests/tiny-cloud-alpine.test +++ b/tests/tiny-cloud-alpine.test @@ -38,7 +38,7 @@ set_network_config_network_interfaces_body() { atf_check \ -o match:"rc-update" \ - -e match:"set_network_interfaces .*done" \ + -e match:"set_network_interfaces: done" \ tiny-cloud early atf_check \ -o match:"auto eth1" \ diff --git a/tests/tiny-cloud.test b/tests/tiny-cloud.test index e305ede..f48e2af 100755 --- a/tests/tiny-cloud.test +++ b/tests/tiny-cloud.test @@ -70,7 +70,7 @@ no_userdata_final_body() { for provider in $PROVIDERS; do CLOUD="$provider" atf_check \ -e not-match:"unknown" \ - -e match:"bootstrap marked complete" \ + -e match:"bootstrap_complete: done" \ tiny-cloud final CLOUD="$provider" atf_check \ -e match:"bootstrap marked incomplete" \