fix(test): wrong variable comparison

refs #17146, #17147, #17150

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --git a/tools/salt-install/Vagrantfile b/tools/salt-install/Vagrantfile
index a448824a948bd4fea08729b22902f26076ec3e11..ed3466ddebd81182540b234d63bbd221efd4b8e9 100644 (file)
--- a/tools/salt-install/Vagrantfile
+++ b/tools/salt-install/Vagrantfile
@@ -33,7 +33,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     arv.vm.provision "shell",
                      path: "provision.sh",
                      args: [
-                       # "--test",
+                       "--test",
                        "--vagrant",
                        "--ssl-port=8443"
                      ].join(" ")

diff --git a/tools/salt-install/tests/run-test.sh b/tools/salt-install/tests/run-test.sh
index a4614aa8be30cdd64d8dbd2a98d7f47a9ae83707..7726d86ecfd4f8de748286303968c7f5ef392306 100755 (executable)
--- a/tools/salt-install/tests/run-test.sh
+++ b/tools/salt-install/tests/run-test.sh
@@ -48,7 +48,7 @@ arv user update --uuid "${user_uuid}" --user '{"is_active": true}'
 echo "Getting the user API TOKEN"
 user_api_token=$(arv api_client_authorization list --filters "[[\"owner_uuid\", \"=\", \"${user_uuid}\"],[\"kind\", \"==\", \"arvados#apiClientAuthorization\"]]" --limit=1 |jq -r .items[].api_token)
 
-if [ "x${user_uuid}" = "x" ]; then
+if [ "x${user_api_token}" = "x" ]; then
   user_api_token=$(arv api_client_authorization create --api-client-authorization "{\"owner_uuid\": \"${user_uuid}\"}" | jq -r .api_token)
 fi