From 9cb6817b3064da5a85d415b6b29dbfd9429d6d8d Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Wed, 15 May 2019 08:13:45 +0300 Subject: [PATCH] azure-run-tests: handle single unexpanded parameter too If TESTS_TO_RUN contains a single parameter that cannot be expanded, bash will not perform brace elimination. Remove braces manually. For example, TESTS_TO_RUN='test_xmlrpc/test_*.py' will not expand outside of ipatests and the script would generate tests_to_run=-k{test_xmlrpc/test_*.py} Braces then will prevent actual ipa-run-tests execution from matching any of XMLRPC tests. Reviewed-By: Christian Heimes Reviewed-By: Rob Crittenden --- ipatests/azure/azure-pipelines.yml | 3 ++- ipatests/azure/azure-run-tests.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ipatests/azure/azure-pipelines.yml b/ipatests/azure/azure-pipelines.yml index 224519891..1222cdb99 100644 --- a/ipatests/azure/azure-pipelines.yml +++ b/ipatests/azure/azure-pipelines.yml @@ -138,7 +138,8 @@ jobs: XMLRPC_tests: TEST_TITLE: 'XMLRPC' TASK_TO_RUN: run-tests - TESTS_TO_RUN: "test_xmlrpc/test_*.py" + TESTS_TO_RUN: "test_xmlrpc" + steps: - template: templates/setup-test-environment.yml parameters: diff --git a/ipatests/azure/azure-run-tests.sh b/ipatests/azure/azure-run-tests.sh index 7b05af1b5..4a661a7a9 100755 --- a/ipatests/azure/azure-run-tests.sh +++ b/ipatests/azure/azure-run-tests.sh @@ -4,7 +4,8 @@ server_domain=example.test server_password=Secret123 # Expand list of tests into -k... -k... -k... .. sequence -tests_to_run=$(eval "eval echo -k{$(echo $TESTS_TO_RUN | sed -e 's/[ \t]+*/,/g')}") +# If remaining string still has { or } characters that shell did not expand, remove them +tests_to_run=$(eval "eval echo -k{$(echo $TESTS_TO_RUN | sed -e 's/[ \t]+*/,/g')}" | tr -d '{}') systemctl --now enable firewalld ipa-server-install -U --domain ${server_domain} --realm ${server_realm} -p ${server_password} -a ${server_password} --setup-dns --setup-kra --auto-forwarders