From aa308693f20b44d0435548566a4bf7a46f945dc6 Mon Sep 17 00:00:00 2001
From: Felix Schwarz <fschwarz@fedoraproject.org>
Date: Jun 04 2020 12:59:49 +0000
Subject: add patch to prevent sporadic test failures


---

diff --git a/borgbackup-prevent-sporadic-failures-in-test_delete_force.patch b/borgbackup-prevent-sporadic-failures-in-test_delete_force.patch
new file mode 100644
index 0000000..2824df1
--- /dev/null
+++ b/borgbackup-prevent-sporadic-failures-in-test_delete_force.patch
@@ -0,0 +1,21 @@
+diff --git a/src/borg/testsuite/archiver.py b/src/borg/testsuite/archiver.py
+index 37cf882..8e2cf0c 100644
+--- a/src/borg/testsuite/archiver.py
++++ b/src/borg/testsuite/archiver.py
+@@ -1495,11 +1495,12 @@ class ArchiverTestCase(ArchiverTestCaseBase):
+             manifest, key = Manifest.load(repository, Manifest.NO_OPERATION_CHECK)
+             archive = Archive(repository, key, manifest, 'test')
+             for item in archive.iter_items():
+-                if 'chunks' in item:
+-                    first_chunk_id = item.chunks[0].id
+-                    repository.delete(first_chunk_id)
+-                    repository.commit()
++                if item.path.endswith('testsuite/archiver.py'):
++                    repository.delete(item.chunks[-1].id)
+                     break
++            else:
++                assert False  # missed the file
++            repository.commit()
+         output = self.cmd('delete', '--force', self.repository_location + '::test')
+         self.assert_in('deleted archive was corrupted', output)
+         self.cmd('check', '--repair', self.repository_location)
diff --git a/borgbackup.spec b/borgbackup.spec
index c3c6d83..970afde 100644
--- a/borgbackup.spec
+++ b/borgbackup.spec
@@ -8,7 +8,7 @@
 
 Name:           %{srcname}
 Version:        1.1.11
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A deduplicating backup program with compression and authenticated encryption
 
 %if %bundle_msgpack
@@ -29,6 +29,10 @@ Source2:        gpgkey-6D5B_EF9A_DD20_7580_5747_B70F_9F88_FB52_FAF7_B393.gpg
 Patch1:         0002-disable-sphinx-man-page-build.patch
 # ability not to build bundled msgpack
 Patch2:         0003-ability-to-unbundle-msgpack.patch
+# This is a backport of upstream commit 47b1c474 (only present in master) to
+# prevent sporadic test failures.
+#   https://github.com/borgbackup/borg/issues/5196
+Patch3:         borgbackup-prevent-sporadic-failures-in-test_delete_force.patch
 
 BuildRequires:  gnupg2
 # build
@@ -180,6 +184,9 @@ py.test-3 -x -vk "$TEST_SELECTOR" $PYTHONPATH/borg/testsuite/*.py
 
 
 %changelog
+* Thu Jun 04 2020 Felix Schwarz <fschwarz@fedoraproject.org> - 1.1.11-3
+- add patch to prevent sporadic test failures (see F31 rebuild attempts)
+
 * Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 1.1.11-2
 - Rebuilt for Python 3.9