From 4b5783047d846b537efc91d6dfc4681d3671453f Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Sun, 17 Nov 2019 19:41:16 -0500 Subject: [PATCH 1/2] fix: Helm 3 now supports the -c flag We use the --tls flag to distinguish between helm3 and helm2. Signed-off-by: Marc Khouzam --- scripts/acceptance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/acceptance.sh b/scripts/acceptance.sh index 324e5f5..733d575 100755 --- a/scripts/acceptance.sh +++ b/scripts/acceptance.sh @@ -113,7 +113,7 @@ export XDG_DATA_HOME=${TMP_DIR}/data && mkdir -p ${XDG_DATA_HOME} # contact the cluster, which may not be accessible, and the command # will timeout. set_shell_debug_level 3 -if helm version -c &> /dev/null; then +if helm version -c --tls &> /dev/null; then echo "====================" echo "Running with Helm v2" echo "====================" From 3316c470da5a9a5651259b819ab66f85a8350f76 Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Sun, 17 Nov 2019 19:43:56 -0500 Subject: [PATCH 2/2] Var to allow completion tests to print to console ROBOT only gives the tester access to the logs at the very end of the test run. When developping, this can be annoying. This change, admittedly a hack, allows to debug the completion tests more easily, by running them outside of ROBOT. Signed-off-by: Marc Khouzam --- scripts/acceptance.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/acceptance.sh b/scripts/acceptance.sh index 733d575..db649a8 100755 --- a/scripts/acceptance.sh +++ b/scripts/acceptance.sh @@ -131,5 +131,10 @@ if [[ ! -d ${ROBOT_VENV_DIR} ]]; then pip install ${ROBOT_PY_REQUIRES} fi +if [ -n "$ROBOT_DEBUG_COMPLETION" ]; then + scripts/completion-tests/test-completion.sh + exit +fi + # Run Robot Framework, output robot --outputdir=${ROBOT_OUTPUT_DIR} ${SUITES_TO_RUN}