From cc286eb37d42c0d6f82748ac4715b7cbda5a21bebe64b0df2b0804eb3058e825 Mon Sep 17 00:00:00 2001
From: Alberto Planas Dominguez <aplanas@suse.com>
Date: Thu, 21 Sep 2017 09:13:59 +0000
Subject: [PATCH] Accepting request 527694 from
 home:tbechtold:branches:devel:languages:python
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add PR-8.patch . This skips a flaky test during python3 test runs

OBS-URL: https://build.opensuse.org/request/show/527694
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-testresources?expand=0&rev=12
---
 PR-8.patch                   | 44 ++++++++++++++++++++++++++++++++++++
 python-testresources.changes |  5 ++++
 python-testresources.spec    |  4 ++++
 3 files changed, 53 insertions(+)
 create mode 100644 PR-8.patch

diff --git a/PR-8.patch b/PR-8.patch
new file mode 100644
index 0000000..f978229
--- /dev/null
+++ b/PR-8.patch
@@ -0,0 +1,44 @@
+From c308ca14278da92c657c1a3a079fafb93443e0f0 Mon Sep 17 00:00:00 2001
+From: Free Ekanayaka <free@ekanayaka.io>
+Date: Sat, 26 Nov 2016 15:37:57 +0000
+Subject: [PATCH] Skip flaky testBasicSortTests on Python 3
+
+---
+ setup.cfg                                         | 1 +
+ testresources/tests/test_optimising_test_suite.py | 2 ++
+ 2 files changed, 3 insertions(+)
+
+Index: testresources-2.0.1/setup.cfg
+===================================================================
+--- testresources-2.0.1.orig/setup.cfg
++++ testresources-2.0.1/setup.cfg
+@@ -19,7 +19,8 @@ classifier =
+ 	Topic :: Software Development :: Testing
+ 
+ [extras]
+-test = 
++test =
++        six
+ 	docutils
+ 	fixtures
+ 	testtools
+Index: testresources-2.0.1/testresources/tests/test_optimising_test_suite.py
+===================================================================
+--- testresources-2.0.1.orig/testresources/tests/test_optimising_test_suite.py
++++ testresources-2.0.1/testresources/tests/test_optimising_test_suite.py
+@@ -15,6 +15,7 @@
+ #  license.
+ #
+ 
++import six
+ import testtools
+ import random
+ import testresources
+@@ -498,6 +499,7 @@ class TestGraphStuff(testtools.TestCase)
+         permutations.append([case4, case1, case3, case2])
+         return permutations
+ 
++    @unittest2.skipIf(six.PY3, "Flaky on Python 3, see LP #1645008")
+     def testBasicSortTests(self):
+         # Test every permutation of inputs, with legacy tests.
+         # Cannot use equal costs because of the use of
diff --git a/python-testresources.changes b/python-testresources.changes
index a2559c6..108c1ff 100644
--- a/python-testresources.changes
+++ b/python-testresources.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 21 09:04:38 UTC 2017 - tbechtold@suse.com
+
+- Add PR-8.patch . This skips a flaky test during python3 test runs
+
 -------------------------------------------------------------------
 Sun Apr  9 13:28:52 UTC 2017 - aloisio@gmx.com
 
diff --git a/python-testresources.spec b/python-testresources.spec
index a4ffde9..cee2921 100644
--- a/python-testresources.spec
+++ b/python-testresources.spec
@@ -25,10 +25,13 @@ License:        (Apache-2.0 or BSD-3-Clause) and GPL-2.0+
 Group:          Development/Languages/Python
 Url:            https://launchpad.net/testresources
 Source:         https://files.pythonhosted.org/packages/source/t/testresources/testresources-%{version}.tar.gz
+# PATCH-FEATURE-UPSTREAM PR-8.patch -- https://github.com/testing-cabal/testresources/pull/8.patch
+Patch1:         PR-8.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module fixtures}
 BuildRequires:  %{python_module pbr}
 BuildRequires:  %{python_module setuptools}
+BuildRequires:  %{python_module six}
 BuildRequires:  %{python_module testtools}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
@@ -43,6 +46,7 @@ of resources by test cases.
 
 %prep
 %setup -q -n testresources-%{version}
+%patch1 -p1
 
 %build
 %python_build