From 237aee86c5fa093039aacccb9cabc171d971a925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 25 May 2016 01:47:56 +0200
Subject: [PATCH] travis: check if package verification really works

QubesOS/qubes-issues#1926
---
 .travis.yml                    | 6 ++++--
 conf/travis-iso-unknown-key.ks | 3 +++
 conf/travis-iso-unsigned.ks    | 3 +++
 expected-failure               | 3 +++
 4 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 conf/travis-iso-unknown-key.ks
 create mode 100644 conf/travis-iso-unsigned.ks
 create mode 100755 expected-failure

diff --git a/.travis.yml b/.travis.yml
index a700dbd..8be15c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,8 +4,10 @@ language: generic
 install: git clone https://github.com/QubesOS/qubes-builder ~/qubes-builder
 script: 
  - ~/qubes-builder/scripts/travis-build
- - travis_wait 30 make -C ~/qubes-builder iso BUILDERCONF=scripts/travis-builder.conf VERBOSE=0 COMPONENTS=installer-qubes-os
+ - travis_wait 30 $EXPECT_FAILURE make -C ~/qubes-builder iso BUILDERCONF=scripts/travis-builder.conf VERBOSE=0 COMPONENTS=installer-qubes-os
 after_script:
  - tail -n 100 ~/qubes-builder/build-logs/installer-qubes-os-iso-*.log
 env:
-  DIST_DOM0=fc20 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso.ks USE_QUBES_REPO_VERSION=3.1
+  - DIST_DOM0=fc20 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso.ks USE_QUBES_REPO_VERSION=3.1
+  - DIST_DOM0=fc20 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unsigned.ks USE_QUBES_REPO_VERSION=3.1 EXPECT_FAILURE=./expected-failure
+  - DIST_DOM0=fc20 INSTALLER_KICKSTART=/tmp/qubes-installer/conf/travis-iso-unknown-key.ks USE_QUBES_REPO_VERSION=3.1 EXPECT_FAILURE=./expected-failure
diff --git a/conf/travis-iso-unknown-key.ks b/conf/travis-iso-unknown-key.ks
new file mode 100644
index 0000000..bc9dee6
--- /dev/null
+++ b/conf/travis-iso-unknown-key.ks
@@ -0,0 +1,3 @@
+%include travis-iso.ks
+
+repo --name=unknown-key --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-3.1-primary --baseurl=http://ftp.qubes-os.org/~marmarek/repo-verify-unknown-key
diff --git a/conf/travis-iso-unsigned.ks b/conf/travis-iso-unsigned.ks
new file mode 100644
index 0000000..b39a451
--- /dev/null
+++ b/conf/travis-iso-unsigned.ks
@@ -0,0 +1,3 @@
+%include travis-iso.ks
+
+repo --name=unsigned --gpgkey=file:///tmp/qubes-installer/qubes-release/RPM-GPG-KEY-qubes-3.1-primary --baseurl=http://ftp.qubes-os.org/~marmarek/repo-verify-unsigned
diff --git a/expected-failure b/expected-failure
new file mode 100755
index 0000000..18e97e4
--- /dev/null
+++ b/expected-failure
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+! "$@"