config/debian/common

@@ -95,7 +95,7 @@ function make_buildd_dir () {
     dak generate-packages-sources2 -a build-queues
     dak generate-releases -a build-queues >/dev/null
 
-    if [[ $archive = securiy ]]; then
+    if [[ $archive = security ]]; then
         ${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-security-buildd
         $configdir/cron.buildd
         sudo -u archvsync runmirrors -a security-buildd-pool

debian/control

@@ -2,6 +2,9 @@ Source: dak
 Section: misc
 Priority: optional
 Build-Depends: debhelper (>= 9~),
+# Either a recent debhelper/dpkg-dev or fakeroot is needed to build test packages
+               debhelper (>= 11.2~) | fakeroot,
+               dpkg-dev (>= 1.19.0.5) | fakeroot,
                jq,
                postgresql-10 | postgresql-9.6 | postgresql-9.4,
                postgresql-10-debversion | postgresql-9.6-debversion | postgresql-9.4-debversion,
@@ -20,6 +23,7 @@ Maintainer: Debian FTP-Masters <ftpmaster@debian.org>
 Uploaders: Mark Hymers <mhy@debian.org>,
            Joerg Jaspert <joerg@debian.org>,
            Torsten Werner <twerner@debian.org>
+Rules-Requires-Root: no
 Standards-Version: 3.9.6.0
 
 Package: dak

tests/fixtures/packages/linux-42.0/debian/control

@@ -3,6 +3,7 @@ Section: kernel
 Priority: optional
 Maintainer: A Maintainer <maint@example.com>
 Build-Depends: debhelper (>= 9)
+Rules-Requires-Root: no
 
 Package: linux-image-all
 Architecture: all

tests/fixtures/packages/nonfree-package-0.1/debian/control

@@ -3,6 +3,7 @@ Section: non-free/misc
 Priority: extra
 Maintainer: A Maintainer <maint@example.com>
 Build-Depends: debhelper (>= 9)
+Rules-Requires-Root: no
 
 Package: nonfree-package
 Architecture: all

tests/fixtures/packages/package-0.1/debian/control

@@ -4,6 +4,7 @@ Priority: extra
 Maintainer: A Maintainer <maint@example.com>
 Uploaders: An Uploader <uploader@example.com>
 Build-Depends: debhelper (>= 9)
+Rules-Requires-Root: no
 
 Package: package
 Architecture: all

tests/fixtures/packages/package-built-using-0.1/debian/control

@@ -3,6 +3,7 @@ Section: misc
 Priority: extra
 Maintainer: A Maintainer <maint@example.com>
 Build-Depends: debhelper (>= 9)
+Rules-Requires-Root: no
 
 Package: package-built-using
 Architecture: all

tests/run-dbtests

 #!/bin/bash
 
+set -e
+
 # Create the database that will be used by the fixtures, populating it with the
 # default data.  Also create a test dak directory.
 
@@ -12,9 +14,11 @@ export PGDATABASE=test_projectb
 
 if [[ ! -v DAK_INTEGRATION_TEST ]]; then
   SYS_CMD="sudo"
+  KEEP_ENV_OPT="-E"
   USER_CMD="sudo -u dak PGDATABASE=${PGDATABASE} DAKBASE=${DAKBASE}"
 else
   SYS_CMD=""
+  KEEP_ENV_OPT=""
   USER_CMD=""
 fi
 
@@ -26,7 +30,7 @@ test-setup() {
 
 test-cleanup() {
   echo Dropping DB ${PGDATABASE}
-  $USER_CMD  -E dropdb ${PGDATABASE}
+  $USER_CMD $KEEP_ENV_OPT dropdb ${PGDATABASE}
   echo Deleting temporary directory
   $SYS_CMD rm -rf -- ${DAKBASE}
 }