Ansgar pushed to branch deploy at Debian FTP Team / dak
Commits:
-
4b803108
by Ansgar Burchardt at 2019-04-14T06:40:19Z
-
e3f6d142
by Ansgar Burchardt at 2019-04-14T06:53:11Z
-
eafe9a42
by Niels Thykier at 2019-04-14T07:17:21Z
-
96d1a295
by Ansgar Burchardt at 2019-04-14T07:41:41Z
-
c47531e0
by Ansgar Burchardt at 2019-04-14T07:41:57Z
-
bd1e1db9
by Ansgar Burchardt at 2019-04-14T07:42:15Z
4 changed files:
- integration-tests/runner-lib
- integration-tests/setup
- scripts/debian/generate-archive-key
- tests/run-dbtests
Changes:
... | ... | @@ -43,7 +43,7 @@ export DAK_ROOT="$(cd $(dirname "${BASH_SOURCE}")/..; pwd)" |
43 | 43 |
|
44 | 44 |
# run-script-with-pg: (cmd, args...) -> ''
|
45 | 45 |
# Run the given cmd (with optional arguments) with a postgres
|
46 |
-# virtual enviromnent running.
|
|
46 |
+# virtual environment running.
|
|
47 | 47 |
|
48 | 48 |
run-script-with-pg() {
|
49 | 49 |
pg_virtualenv -v "${pgversion}" "$@"
|
... | ... | @@ -25,9 +25,11 @@ test-setup() { |
25 | 25 |
local setupdir="${DAK_ROOT}/setup"
|
26 | 26 |
|
27 | 27 |
export DAKBASE=$(mktemp -d)
|
28 |
+ export HOME="${DAKBASE}/home"
|
|
28 | 29 |
export DAKHOST=dak-master
|
29 | 30 |
export PGDATABASE=projectb
|
30 | 31 |
|
32 |
+ mkdir "$HOME" || exit $?
|
|
31 | 33 |
${setupdir}/dak-setup.sh
|
32 | 34 |
|
33 | 35 |
export PATH="${DAKBASE}/bin:${PATH}"
|
... | ... | @@ -15,7 +15,7 @@ conf=${1:-""} |
15 | 15 |
output=${2:-""}
|
16 | 16 |
|
17 | 17 |
err=0
|
18 |
-for package in gnupg libgfshare-bin pinentry-tty; do
|
|
18 |
+for package in gnupg libgfshare-bin pinentry-curses; do
|
|
19 | 19 |
if ! dpkg -l ${package} >/dev/null 2>&1; then
|
20 | 20 |
echo "Missing package ${package}"
|
21 | 21 |
err=1
|
... | ... | @@ -25,6 +25,11 @@ if [[ ${err} -ne 0 ]]; then |
25 | 25 |
exit 8
|
26 | 26 |
fi
|
27 | 27 |
|
28 |
+if ! [ -w "$(tty)" ]; then
|
|
29 |
+ echo "E: No access to tty; required for passphrase input"
|
|
30 |
+ exit 1
|
|
31 |
+fi
|
|
32 |
+ |
|
28 | 33 |
# designated revokers
|
29 | 34 |
revokers=(
|
30 | 35 |
80E976F14A508A48E9CA3FE9BC372252CA1CF964 # Ansgar Burchardt <ansgar@debian.org>
|
... | ... | @@ -140,7 +145,7 @@ default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB |
140 | 145 |
EOF
|
141 | 146 |
|
142 | 147 |
cat > gpg-agent.conf <<EOF
|
143 |
-pinentry-program /usr/bin/pinentry-tty
|
|
148 |
+pinentry-program /usr/bin/pinentry-curses
|
|
144 | 149 |
EOF
|
145 | 150 |
|
146 | 151 |
cat > generate-key.conf <<EOF
|
... | ... | @@ -25,7 +25,9 @@ fi |
25 | 25 |
test-setup() {
|
26 | 26 |
# Create the database as expected by the tests
|
27 | 27 |
export DAKBASE=${DAK_ROOT}/tests/fixtures/tmpdak
|
28 |
+ export HOME="${DAKBASE}/home"
|
|
28 | 29 |
${DAK_ROOT}/setup/dak-setup.sh
|
30 |
+ mkdir "$HOME" || exit $?
|
|
29 | 31 |
}
|
30 | 32 |
|
31 | 33 |
test-cleanup() {
|