[dak/master] integration tests: try processing packages with `dak process-upload`

[Ansgar Burchardt <ansgar@debian.org>]

---
 debian/rules                       |  2 ++
 integration-tests/setup            |  4 +++-
 integration-tests/tests/0001-basic | 11 ++++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 139f043..d93ceab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ ifneq ($(JENKINS_EXPORTS_DIR),)
 	mkdir -pv $(JENKINS_EXPORTS_DIR)/test-results
 endif
 	mkdir -p debian/test-gnupghome
+	make -C tests/fixtures/packages
 	GNUPGHOME=$$(pwd)/debian/test-gnupghome py.test -v tests $(PYBUILD_EXTRA_ARGS)
 	./integration-tests/run-tests
 endif
@@ -20,5 +21,6 @@ endif
 # Replace with "debian/test-gnupghome/" in d/clean once
 # debhelper (>= 9.20151116) can be used for dak
 override_dh_auto_clean:
+	make -C tests/fixtures/packages clean
 	rm -fr debian/test-gnupghome
 	dh_auto_clean
diff --git a/integration-tests/setup b/integration-tests/setup
index 08e8d9d..89265ab 100755
--- a/integration-tests/setup
+++ b/integration-tests/setup
@@ -17,7 +17,8 @@ dak-setup() {
   unset PGDATABASE
   (cd ${setupdir}; ./init_core)
 
-  mkdir ${DAKBASE}/etc ${DAKBASE}/bin
+  mkdir ${DAKBASE}/etc ${DAKBASE}/bin ${DAKBASE}/keyrings ${DAKBASE}/tmp
+  ln -s ${DAK_ROOT}/templates ${DAKBASE}/
 
   export DAK_CONFIG="${DAKBASE}/etc/dak.conf"
   (cd ${setupdir}; ./init_minimal_conf) > ${DAK_CONFIG}
@@ -27,6 +28,7 @@ dak-setup() {
   ln -s ${DAK_ROOT}/dak/dak.py ${DAKBASE}/bin/dak
 
   dak update-db --yes
+  dak init-dirs
 }
 
 dak-cleanup() {
diff --git a/integration-tests/tests/0001-basic b/integration-tests/tests/0001-basic
index c34adda..c25058c 100755
--- a/integration-tests/tests/0001-basic
+++ b/integration-tests/tests/0001-basic
@@ -9,7 +9,7 @@ set -u
 # add a unstable suite with amd64
 dak admin architecture add amd64 AMD64
 dak admin suite add unstable "" codename=sid
-dak admin suite-architecture add unstable all amd64
+dak admin suite-architecture add unstable source all amd64
 dak admin suite-component add unstable main contrib non-free
 
 (
@@ -32,3 +32,12 @@ dak admin suite-component add unstable main contrib non-free
   co_unstable="$(dak control-override -l unstable)"
   assert-equal "dak control-override -l unstable" "${co_unstable}" ""
 )
+
+(
+  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
+  cp ${packages:?}/nonfree-package_* ${packages:?}/package_* ${DAKBASE}/tmp
+
+  dak process-upload -d ${DAKBASE}/tmp --automatic
+)
-- 
2.1.4