From d0f87169f48910c88d56053563a2609c548adc67 Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Mon, 28 Dec 2020 22:38:30 +0100 Subject: [PATCH] fix all test if BOTTOKEN is set --- test/ALL-tests.inc.sh | 5 +++-- test/c-init-test.sh | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ALL-tests.inc.sh b/test/ALL-tests.inc.sh index d232243..cc540c0 100644 --- a/test/ALL-tests.inc.sh +++ b/test/ALL-tests.inc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.20-0-g2ab00a2 +#### $$VERSION$$ v1.21-dev-26-gbe87ba3 # common variables export TESTME DIRME TESTDIR LOGFILE REFDIR TESTNAME @@ -34,7 +34,8 @@ export INPUTFILE REFFILE INPUTFILE2 REFFILE2 OUTPUTFILE REFFILE2="${DIRME}/${REFDIR}/${REFDIR}2.result" # do not query telegram when testing -export BASHBOT_URL TESTTOKEN +export BASHBOT_URL TESTTOKEN BOTTOKEN +BOTTOKEN="" BASHBOT_URL="https://my-json-server.typicode.com/topkecleon/telegram-bot-bash/getMe?" TESTTOKEN="123456789:BASHBOTTESTSCRIPTbashbottestscript_" diff --git a/test/c-init-test.sh b/test/c-init-test.sh index 6caf8e7..bd8290d 100755 --- a/test/c-init-test.sh +++ b/test/c-init-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.21-dev-25-gd496639 +#### $$VERSION$$ v1.21-dev-26-gbe87ba3 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh @@ -10,7 +10,6 @@ TESTFILES="${TOKENFILE} ${ACLFILE} ${COUNTFILE} ${BLOCKEDFILE} ${ADMINFILE}" set -e # run bashbot first time with init -export BOTTOKEN="" "${TESTDIR}/bashbot.sh" init >"${LOGFILE}" <