From 7903df96c48a9227fa227b8ee1755da73bc03a42 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Mon, 30 Jul 2018 16:52:32 +0100
Subject: [PATCH] Skip a test that is non-deterministic and can spuriously fail

This is not suitable for build-time testing or gating migration in
autopkgtest.
---
 debian/changelog                              |  9 +++++
 .../Skip-test-pull-repeated-during-CI.patch   | 34 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 44 insertions(+)
 create mode 100644 debian/patches/debian/Skip-test-pull-repeated-during-CI.patch

diff --git a/debian/changelog b/debian/changelog
index 33d0840c..80afe134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ostree (2018.7-2) UNRELEASED; urgency=medium
+
+  * d/p/debian/Skip-test-pull-repeated-during-CI.patch:
+    Skip a test that is non-deterministic and can spuriously fail,
+    which is not suitable for build-time testing or gating migration in
+    autopkgtest.
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 30 Jul 2018 16:51:32 +0100
+
 ostree (2018.7-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch b/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch
new file mode 100644
index 00000000..4b370fbb
--- /dev/null
+++ b/debian/patches/debian/Skip-test-pull-repeated-during-CI.patch
@@ -0,0 +1,34 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Mon, 30 Jul 2018 16:51:01 +0100
+Subject: Skip test-pull-repeated during CI
+
+This test is expected to fail a small proportion of the time. During
+the build of ostree 2018.7-1 in Debian, it seems we were unlucky on
+s390x. Non-deterministic tests are also problematic for autopkgtest,
+where they can gate migration of our dependencies like GLib, so skip
+this test unless the caller has opted-in to non-deterministic tests.
+
+It would be appropriate to enable this test in environments where
+failures can easily be retried and are not disruptive to other
+packages.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ tests/test-pull-repeated.sh | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/test-pull-repeated.sh b/tests/test-pull-repeated.sh
+index a2707d6..33b9d37 100755
+--- a/tests/test-pull-repeated.sh
++++ b/tests/test-pull-repeated.sh
+@@ -23,6 +23,10 @@ set -euo pipefail
+ 
+ . $(dirname $0)/libtest.sh
+ 
++if [ "${OSTREE_TEST_ALLOW_RANDOM:-}" != 1 ]; then
++    skip "Non-deterministic test will fail if we are unlucky"
++fi
++
+ echo "1..4"
+ 
+ COMMIT_SIGN="--gpg-homedir=${TEST_GPG_KEYHOME} --gpg-sign=${TEST_GPG_KEYID_1}"
diff --git a/debian/patches/series b/debian/patches/series
index ad0ed6ab..9adee331 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 lib-pull-Fix-minor-memleak-in-error-path.patch
+debian/Skip-test-pull-repeated-during-CI.patch