Skip to content
Commits on Source (4)
*.pyc
*~
.coverage
.coverage.*.*
.idea
.cache
cover/
web/epydoc/
web/d-i
......@@ -27,3 +30,11 @@ web/transitions.yaml
web/cruft-report-daily.txt
web/pseudo-packages.*
web/licenses/
tests/fixtures/packages/*.buildinfo
tests/fixtures/packages/*.tar.*
tests/fixtures/packages/*.deb
tests/fixtures/packages/*.dsc
tests/fixtures/packages/**/.debhelper
tests/fixtures/packages/**/*.debhelper.log
tests/fixtures/packages/**/*.substvars
......@@ -17,8 +17,6 @@ Various
* Check TODO.old and move still-valid/useful entries over here.
* need a testsuite _badly_
* database table "binaries" contains a column 'type TEXT NOT
NULL'. This should be made a FK on override_type, as it only contains
deb/udeb strings.
......
......@@ -29,10 +29,16 @@ dak-setup() {
PG_CMD="sudo -E -u postgres"
SYS_CMD="sudo -E"
USER_CMD="sudo -E -u dak -s -H"
PYTHON_COVERAGE=
else
PG_CMD=""
SYS_CMD=""
USER_CMD=""
if [ "$RUN_COVERAGE" = "y" ]; then
PYTHON_COVERAGE="python-coverage run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode"
else
PYTHON_COVERAGE=
fi
fi
# Get default values from init_vars.
......@@ -83,9 +89,9 @@ dak-setup() {
fi
# Update the database schema
$USER_CMD ${DAK_ROOT}/dak/dak.py update-db --yes
$USER_CMD $PYTHON_COVERAGE ${DAK_ROOT}/dak/dak.py update-db --yes
# Run dak init-dirs to set up the initial /srv/dak tree
$USER_CMD ${DAK_ROOT}/dak/dak.py init-dirs
$USER_CMD $PYTHON_COVERAGE ${DAK_ROOT}/dak/dak.py init-dirs
}
dak-setup
......@@ -16,10 +16,16 @@ if [[ ! -v DAK_INTEGRATION_TEST ]]; then
SYS_CMD="sudo"
KEEP_ENV_OPT="-E"
USER_CMD="sudo -u dak PGDATABASE=${PGDATABASE} DAKBASE=${DAKBASE}"
PYTHON_COVERAGE=
else
SYS_CMD=""
KEEP_ENV_OPT=""
USER_CMD=""
if [ "$RUN_COVERAGE" = "y" ]; then
PYTHON_COVERAGE="python-coverage run --rcfile ${DAK_ROOT}/.coveragerc --parallel-mode"
else
PYTHON_COVERAGE=
fi
fi
test-setup() {
......@@ -43,4 +49,4 @@ if [[ "$1" != "--nocleanup" ]]; then
fi
test-setup
$USER_CMD ${DAK_ROOT}/tests/dbtest_all.py
$USER_CMD $PYTHON_COVERAGE ${DAK_ROOT}/tests/dbtest_all.py