diff --git a/integration-tests/common b/integration-tests/common index 6ecdaf46b8a4f9687fdf028eee8b9fb3d5e6c001..3dcb2f53207f25bf5b3de702c4d58ceabedb9e31 100644 --- a/integration-tests/common +++ b/integration-tests/common @@ -22,3 +22,14 @@ assert-equal() { exit 1 fi } + +fixture-package-dir() { + packages=${DAK_ROOT:?}/tests/fixtures/packages + echo "${packages}" +} + +import-fixture-signing-key() { + packages=$(fixture-package-dir) + ln -sf ${packages:?}/gpg/pubring.gpg ${DAKBASE:?}/keyrings/upload-keyring.gpg + dak import-keyring -U "%s" ${DAKBASE}/keyrings/upload-keyring.gpg +} diff --git a/integration-tests/tests/0001-basic b/integration-tests/tests/0001-basic index f65672b44a05201311d67ef5d4bd28d10ecb1871..2ed6a4889f978bd28df6ea40f7c480ca2c4741b4 100755 --- a/integration-tests/tests/0001-basic +++ b/integration-tests/tests/0001-basic @@ -59,9 +59,9 @@ EOF ) ( - packages=${DAK_ROOT:?}/tests/fixtures/packages - ln -sf ${packages:?}/gpg/pubring.gpg ${DAKBASE:?}/keyrings/upload-keyring.gpg - dak import-keyring -U "%s" ${DAKBASE}/keyrings/upload-keyring.gpg + packages=$(fixture-package-dir) + import-fixture-signing-key + cp ${packages:?}/nonfree-package_* ${packages:?}/package_* ${DAKBASE}/tmp dak process-upload -d ${DAKBASE}/tmp --automatic