From f36a57b3b18501a75d9691c31740ba997499b45a Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 17 May 2016 13:04:44 +0200
Subject: tests: Use gpg signatures during test

---
 tests/Makefile.am.inc      |  9 +++++++++
 tests/libtest.sh           | 15 +++++++++------
 tests/make-test-app.sh     |  2 +-
 tests/make-test-runtime.sh |  2 +-
 tests/test-builder.sh      |  4 ++--
 5 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/tests/Makefile.am.inc b/tests/Makefile.am.inc
index 4724547..931d15d 100644
--- a/tests/Makefile.am.inc
+++ b/tests/Makefile.am.inc
@@ -70,6 +70,15 @@ installed_test_data = \
 	tests/session.conf.in \
 	$(NULL)
 
+if ENABLE_INSTALLED_TESTS
+installed_test_keyringdir = $(installed_testdir)/test-keyring
+installed_test_keyring_DATA = \
+	tests/test-keyring/pubring.gpg \
+	tests/test-keyring/secring.gpg \
+	$(NULL)
+
+endif
+
 EXTRA_DIST += $(installed_test_SCRIPTS) $(installed_test_data)
 
 test_scripts = \
diff --git a/tests/libtest.sh b/tests/libtest.sh
index f699e07..2bbc592 100644
--- a/tests/libtest.sh
+++ b/tests/libtest.sh
@@ -145,21 +145,24 @@ assert_file_empty() {
     fi
 }
 
+export FL_GPG_HOMEDIR=$(dirname $0)/test-keyring
+export FL_GPG_ID=7B0961FD
+export FL_GPGARGS="--gpg-homedir=${FL_GPG_HOMEDIR} --gpg-sign=${FL_GPG_ID}"
+
 setup_repo () {
-    . $(dirname $0)/make-test-runtime.sh org.test.Platform bash ls cat echo readlink > /dev/null
-    . $(dirname $0)/make-test-app.sh > /dev/null
-    flatpak remote-add ${U} --no-gpg-verify test-repo repo
+    GPGARGS="$FL_GPGARGS" . $(dirname $0)/make-test-runtime.sh org.test.Platform bash ls cat echo readlink > /dev/null
+    GPGARGS="$FL_GPGARGS" . $(dirname $0)/make-test-app.sh > /dev/null
+    flatpak remote-add ${U} --gpg-import=${FL_GPG_HOMEDIR}/pubring.gpg test-repo repo
 }
 
 make_updated_app () {
-    . $(dirname $0)/make-test-app.sh UPDATED > /dev/null
+    GPGARGS="$FL_GPGARGS" . $(dirname $0)/make-test-app.sh UPDATED > /dev/null
 }
 
 setup_sdk_repo () {
-    . $(dirname $0)/make-test-runtime.sh org.test.Sdk bash ls cat echo readlink make mkdir cp touch > /dev/null
+    GPGARGS="$FL_GPGARGS" . $(dirname $0)/make-test-runtime.sh org.test.Sdk bash ls cat echo readlink make mkdir cp touch > /dev/null
 }
 
-
 install_repo () {
     ${FLATPAK} ${U} install test-repo org.test.Platform master
     ${FLATPAK} ${U} install test-repo org.test.Hello master
diff --git a/tests/make-test-app.sh b/tests/make-test-app.sh
index 92d4012..64b72bc 100755
--- a/tests/make-test-app.sh
+++ b/tests/make-test-app.sh
@@ -50,5 +50,5 @@ EOF
 cp $(dirname $0)/org.test.Hello.png ${DIR}/files/share/app-info/icons/flatpak/64x64/
 
 flatpak build-finish --command=hello.sh ${DIR}
-flatpak build-export repo ${DIR}
+flatpak build-export ${GPGARGS-} repo ${DIR}
 rm -rf ${DIR}
diff --git a/tests/make-test-runtime.sh b/tests/make-test-runtime.sh
index d2aeb3b..8a3c455 100755
--- a/tests/make-test-runtime.sh
+++ b/tests/make-test-runtime.sh
@@ -32,5 +32,5 @@ done
 mkdir -p ${DIR}/usr/lib/locale/
 cp -r /usr/lib/locale/C.* ${DIR}/usr/lib/locale/en_US
 
-flatpak build-export --runtime repo ${DIR}
+flatpak build-export --runtime ${GPGARGS-} repo ${DIR}
 rm -rf ${DIR}
diff --git a/tests/test-builder.sh b/tests/test-builder.sh
index 01195b7..19b44c6 100755
--- a/tests/test-builder.sh
+++ b/tests/test-builder.sh
@@ -35,7 +35,7 @@ cd $TEST_DATA_DIR/
 cp -a $(dirname $0)/test-configure .
 echo "version1" > app-data
 cp $(dirname $0)/test.json .
-flatpak-builder --repo=$REPO --force-clean appdir test.json > /dev/null
+flatpak-builder --repo=$REPO $FL_GPGARGS --force-clean appdir test.json > /dev/null
 
 assert_file_has_content appdir/files/share/app-data version1
 assert_file_has_content appdir/metadata shared=network;
@@ -61,7 +61,7 @@ assert_file_has_content app_data_1 version1
 echo "ok install+run"
 
 echo "version2" > app-data
-flatpak-builder --repo=$REPO --force-clean appdir test.json > /dev/null
+flatpak-builder $FL_GPGARGS --repo=$REPO --force-clean appdir test.json > /dev/null
 assert_file_has_content appdir/files/share/app-data version2
 
 ${FLATPAK} ${U} update org.test.Hello2 master
-- 
cgit v1.2.1