From bb686a860c6631371415229e5c07b1218ee2126d Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Thu, 11 Jul 2024 13:05:02 -0400 Subject: [PATCH] integration/run-integration-tests: fix detection of explicit_trust_token API extension Signed-off-by: Simon Deziel --- integration/run-integration-tests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/run-integration-tests b/integration/run-integration-tests index 1b913c68..3f18af38 100755 --- a/integration/run-integration-tests +++ b/integration/run-integration-tests @@ -18,7 +18,7 @@ fi # Make sure a client.{crt,key} exist by trying to add a bogus remote lxc remote add foo 127.0.0.1:1234 2>/dev/null || true -if ! lxc query /1.0 | grep -q '"explicit_trust_token"$'; then +if ! lxc info | grep -qwF explicit_trust_token; then lxc config set core.trust_password password fi lxc config set core.https_address 127.0.0.1 @@ -64,7 +64,7 @@ for cert in $(comm -13 "${OLD_TRUST_LIST}" "${NEW_TRUST_LIST}"); do done rm -f "${OLD_TRUST_LIST}" "${NEW_TRUST_LIST}" -if ! lxc query /1.0 | grep -q '"explicit_trust_token"$'; then +if ! lxc info | grep -qwF explicit_trust_token; then lxc config unset core.trust_password || true fi lxc config unset core.https_address || true