From 1777c30e470490ade101edc0961a4dff4fb31180 Mon Sep 17 00:00:00 2001
From: Niels Thykier <niels@thykier.net>
Date: Sat, 13 Apr 2019 06:53:43 +0000
Subject: [PATCH] integration-tests: Move some logic from 0001-basic to common

Signed-off-by: Niels Thykier <niels@thykier.net>
---
 integration-tests/common           | 11 +++++++++++
 integration-tests/tests/0001-basic |  6 +++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/integration-tests/common b/integration-tests/common
index 6ecdaf46..3dcb2f53 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 f65672b4..2ed6a488 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
-- 
GitLab