integration-tests/setup

@@ -25,9 +25,11 @@ test-setup() {
   local setupdir="${DAK_ROOT}/setup"
 
   export DAKBASE=$(mktemp -d)
+  export HOME="${DAKBASE}/home"
   export DAKHOST=dak-master
   export PGDATABASE=projectb
 
+  mkdir "$HOME" || exit $?
   ${setupdir}/dak-setup.sh
 
   export PATH="${DAKBASE}/bin:${PATH}"

scripts/debian/generate-archive-key

@@ -15,7 +15,7 @@ conf=${1:-""}
 output=${2:-""}
 
 err=0
-for package in gnupg libgfshare-bin pinentry-tty; do
+for package in gnupg libgfshare-bin pinentry-curses; do
     if ! dpkg -l ${package} >/dev/null 2>&1; then
         echo "Missing package ${package}"
         err=1
@@ -25,6 +25,11 @@ if [[ ${err} -ne 0 ]]; then
     exit 8
 fi
 
+if ! [ -w "$(tty)" ]; then
+    echo "E: No access to tty; required for passphrase input"
+    exit 1
+fi
+
 # designated revokers
 revokers=(
     80E976F14A508A48E9CA3FE9BC372252CA1CF964 # Ansgar Burchardt <ansgar@debian.org>
@@ -140,7 +145,7 @@ default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB
 EOF
 
 cat > gpg-agent.conf <<EOF
-pinentry-program /usr/bin/pinentry-tty
+pinentry-program /usr/bin/pinentry-curses
 EOF
 
 cat > generate-key.conf <<EOF

tests/run-dbtests

@@ -25,7 +25,9 @@ fi
 test-setup() {
   # Create the database as expected by the tests
   export DAKBASE=${DAK_ROOT}/tests/fixtures/tmpdak
+  export HOME="${DAKBASE}/home"
   ${DAK_ROOT}/setup/dak-setup.sh
+  mkdir "$HOME" || exit $?
 }
 
 test-cleanup() {