From d13e95ada9ef832c67128528d0e476476061bdc9 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Thu, 31 Dec 2020 22:43:33 +0100 Subject: [PATCH] reset ENV before tests --- dev/all-tests.sh | 6 +++--- test/ALL-tests.inc.sh | 10 +++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dev/all-tests.sh b/dev/all-tests.sh index cb0e50e..6d404fa 100755 --- a/dev/all-tests.sh +++ b/dev/all-tests.sh @@ -5,7 +5,7 @@ # # Description: run all tests, exit after failed test # -#### $$VERSION$$ v1.21-dev-25-gd496639 +#### $$VERSION$$ v1.21-dev-45-gddb2785 ############################################################# # magic to ensure that we're always inside the root of our application, @@ -67,8 +67,8 @@ if [ "$fail" -eq 0 ]; then else /bin/echo -n 'FAILURE ' exitcode=1 - rm -rf "${TESTENV}/test" - find "${TESTENV}/"* ! -name '[a-z]-*' -delete + #rm -rf "${TESTENV}/test" + #find "${TESTENV}/"* ! -name '[a-z]-*' -delete fi ######################### diff --git a/test/ALL-tests.inc.sh b/test/ALL-tests.inc.sh index cc540c0..fb7e88b 100644 --- a/test/ALL-tests.inc.sh +++ b/test/ALL-tests.inc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.21-dev-26-gbe87ba3 +#### $$VERSION$$ v1.21-dev-45-gddb2785 # common variables export TESTME DIRME TESTDIR LOGFILE REFDIR TESTNAME @@ -33,9 +33,13 @@ export INPUTFILE REFFILE INPUTFILE2 REFFILE2 OUTPUTFILE INPUTFILE2="${DIRME}/${REFDIR}/${REFDIR}2.input" REFFILE2="${DIRME}/${REFDIR}/${REFDIR}2.result" -# do not query telegram when testing -export BASHBOT_URL TESTTOKEN BOTTOKEN +# reset ENVIRONMENT +export BASHBOT_URL TESTTOKEN BOTTOKEN BASHBOT_HOME BASHBOT_VAR BASHBOT_ETC BOTTOKEN="" +BASHBOT_HOME="" +BASHBOT_VAR="" +BASHBOT_ETC="" +# do not query telegram when testing BASHBOT_URL="https://my-json-server.typicode.com/topkecleon/telegram-bot-bash/getMe?" TESTTOKEN="123456789:BASHBOTTESTSCRIPTbashbottestscript_"