fix test with existing config

This commit is contained in:
Kay Marquardt (Gnadelwartz) 2020-12-04 21:35:21 +01:00
parent d6e1c222f7
commit 04ec4baab2
3 changed files with 7 additions and 3 deletions

View File

@ -5,7 +5,7 @@
# #
# tested on: ubuntu, opensuse, debian # tested on: ubuntu, opensuse, debian
# #
#### $$VERSION$$ v1.2-5-g658fac6 #### $$VERSION$$ v1.2-7-gd6e1c22
# shellcheck disable=SC2009 # shellcheck disable=SC2009
# shellcheck disable=SC2181 # shellcheck disable=SC2181

View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# this has to run once atfer git clone # this has to run once atfer git clone
# and every time we create new hooks # 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, # magic to ensure that we're always inside the root of our application,
# no matter from which directory we'll run script # no matter from which directory we'll run script
@ -18,6 +18,9 @@ mkdir "${TESTENV}"
cp -r ./* "${TESTENV}" cp -r ./* "${TESTENV}"
cd "test" || exit 1 cd "test" || exit 1
# delete possible config
rm "${TESTENV}/botconfig.jssh" "${TESTENV}/botacl"
#set -e #set -e
fail=0 fail=0
tests=0 tests=0

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#### $$VERSION$$ v1.2-0-gc50499c #### $$VERSION$$ v1.2-7-gd6e1c22
# include common functions and definitions # include common functions and definitions
# shellcheck source=test/ALL-tests.inc.sh # shellcheck source=test/ALL-tests.inc.sh
@ -14,6 +14,7 @@ set -e
$TESTTOKEN $TESTTOKEN
nobody nobody
botadmin botadmin
EOF EOF
echo "${SUCCESS}" echo "${SUCCESS}"