From 04ec4baab2d8453d64f39b45ba0f534af59011be Mon Sep 17 00:00:00 2001 From: "Kay Marquardt (Gnadelwartz)" Date: Fri, 4 Dec 2020 21:35:21 +0100 Subject: [PATCH] fix test with existing config --- bashbot.rc | 2 +- dev/all-tests.sh | 5 ++++- test/c-init-test.sh | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/bashbot.rc b/bashbot.rc index 9ee685a..d4719dd 100755 --- a/bashbot.rc +++ b/bashbot.rc @@ -5,7 +5,7 @@ # # tested on: ubuntu, opensuse, debian # -#### $$VERSION$$ v1.2-5-g658fac6 +#### $$VERSION$$ v1.2-7-gd6e1c22 # shellcheck disable=SC2009 # shellcheck disable=SC2181 diff --git a/dev/all-tests.sh b/dev/all-tests.sh index 91e45f4..b89edd8 100755 --- a/dev/all-tests.sh +++ b/dev/all-tests.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # this has to run once atfer git clone # and every time we create new hooks -#### $$VERSION$$ v1.2-0-gc50499c +#### $$VERSION$$ v1.2-7-gd6e1c22 # magic to ensure that we're always inside the root of our application, # no matter from which directory we'll run script @@ -18,6 +18,9 @@ mkdir "${TESTENV}" cp -r ./* "${TESTENV}" cd "test" || exit 1 +# delete possible config +rm "${TESTENV}/botconfig.jssh" "${TESTENV}/botacl" + #set -e fail=0 tests=0 diff --git a/test/c-init-test.sh b/test/c-init-test.sh index ae80385..6456d59 100755 --- a/test/c-init-test.sh +++ b/test/c-init-test.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -#### $$VERSION$$ v1.2-0-gc50499c +#### $$VERSION$$ v1.2-7-gd6e1c22 # include common functions and definitions # shellcheck source=test/ALL-tests.inc.sh @@ -14,6 +14,7 @@ set -e $TESTTOKEN nobody botadmin + EOF echo "${SUCCESS}"