Make tests work with the new XDG dirs
Also minor improvements on style.
This commit is contained in:
parent
a3b75fc2bb
commit
129bb7233e
1 changed files with 10 additions and 3 deletions
|
|
@ -2,14 +2,21 @@
|
||||||
# stop on failure
|
# stop on failure
|
||||||
set -e
|
set -e
|
||||||
BACKEND="${1}"
|
BACKEND="${1}"
|
||||||
[ "${WEBOOB_WORKDIR}" != "" ] || WEBOOB_WORKDIR="${HOME}/.weboob"
|
if [ -z "${WEBOOB_WORKDIR}" ]; then
|
||||||
[ "${TMPDIR}" != "" ] || TMPDIR="/tmp"
|
# use the old workdir by default
|
||||||
|
WEBOOB_WORKDIR="${HOME}/.weboob"
|
||||||
|
# but if we can find a valid xdg workdir, switch to it
|
||||||
|
[ "${XDG_CONFIG_HOME}" != "" ] || XDG_CONFIG_HOME="${HOME}/.config"
|
||||||
|
[ -d "${XDG_CONFIG_HOME}/weboob" ] && WEBOOB_WORKDIR="${XDG_CONFIG_HOME}/weboob"
|
||||||
|
fi
|
||||||
|
[ -z "${TMPDIR}" ] && TMPDIR="/tmp"
|
||||||
|
|
||||||
# do not allow undefined variables anymore
|
# do not allow undefined variables anymore
|
||||||
set -u
|
set -u
|
||||||
WEBOOB_TMPDIR=$(mktemp -d "${TMPDIR}/weboob_test.XXXXX")
|
WEBOOB_TMPDIR=$(mktemp -d "${TMPDIR}/weboob_test.XXXXX")
|
||||||
cp "${WEBOOB_WORKDIR}/backends" "${WEBOOB_TMPDIR}/"
|
cp "${WEBOOB_WORKDIR}/backends" "${WEBOOB_TMPDIR}/"
|
||||||
|
|
||||||
|
# path to sources
|
||||||
WEBOOB_DIR=$(readlink -e $(dirname $0)/..)
|
WEBOOB_DIR=$(readlink -e $(dirname $0)/..)
|
||||||
echo "file://$WEBOOB_DIR/modules" > "${WEBOOB_TMPDIR}/sources.list"
|
echo "file://$WEBOOB_DIR/modules" > "${WEBOOB_TMPDIR}/sources.list"
|
||||||
|
|
||||||
|
|
@ -18,7 +25,7 @@ export WEBOOB_WORKDIR="${WEBOOB_TMPDIR}"
|
||||||
|
|
||||||
# allow failing commands past this point
|
# allow failing commands past this point
|
||||||
set +e
|
set +e
|
||||||
if [ "${BACKEND}" != "" ]; then
|
if [ -n "${BACKEND}" ]; then
|
||||||
nosetests -sv "${WEBOOB_DIR}/modules/${BACKEND}"
|
nosetests -sv "${WEBOOB_DIR}/modules/${BACKEND}"
|
||||||
else
|
else
|
||||||
find "${WEBOOB_DIR}/weboob" "${WEBOOB_DIR}/modules" -name test.py | xargs nosetests -sv
|
find "${WEBOOB_DIR}/weboob" "${WEBOOB_DIR}/modules" -name test.py | xargs nosetests -sv
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue