forked from pool/python-testresources
Accepting request 627850 from devel:languages:python
- Add patch testresources-flaky-tests.patch to disable flaky test - Drop PR-8.patch as it is obsolete by the above patch - Cleanup with spec-cleaner - Simplify the tests execution - Install license files OBS-URL: https://build.opensuse.org/request/show/627850 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-testresources?expand=0&rev=9
This commit is contained in:
Git OBS Bridge
44
PR-8.patch
44
PR-8.patch
@@ -1,44 +0,0 @@
|
||||
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
|
||||
@@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 7 10:33:15 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Add patch testresources-flaky-tests.patch to disable flaky test
|
||||
- Drop PR-8.patch as it is obsolete by the above patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 7 10:17:11 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
- Cleanup with spec-cleaner
|
||||
- Simplify the tests execution
|
||||
- Install license files
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 21 09:04:38 UTC 2017 - tbechtold@suse.com
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-testresources
|
||||
#
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -21,22 +21,18 @@ Name: python-testresources
|
||||
Version: 2.0.1
|
||||
Release: 0
|
||||
Summary: Testresources, a pyunit extension for managing expensive test resources
|
||||
License: (Apache-2.0 or BSD-3-Clause) and GPL-2.0+
|
||||
License: (Apache-2.0 OR BSD-3-Clause) AND GPL-2.0-or-later
|
||||
Group: Development/Languages/Python
|
||||
Url: https://launchpad.net/testresources
|
||||
URL: https://github.com/testing-cabal/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}
|
||||
Patch0: testresources-flaky-tests.patch
|
||||
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
|
||||
Requires: python-pbr
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
%python_subpackages
|
||||
|
||||
@@ -46,7 +42,7 @@ of resources by test cases.
|
||||
|
||||
%prep
|
||||
%setup -q -n testresources-%{version}
|
||||
%patch1 -p1
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%python_build
|
||||
@@ -56,10 +52,10 @@ of resources by test cases.
|
||||
%python_expand %fdupes -s %{buildroot}%{$python_sitelib}
|
||||
|
||||
%check
|
||||
%python_expand LANG=en_US.UTF-8 PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m testtools.run discover
|
||||
%python_exec setup.py test
|
||||
|
||||
%files %{python_files}
|
||||
%defattr(-,root,root,-)
|
||||
%license BSD Apache-2.0 COPYING
|
||||
%doc README.rst
|
||||
%{python_sitelib}/testresources
|
||||
%{python_sitelib}/testresources-%{version}-py%{python_version}.egg-info
|
||||
|
||||
12
testresources-flaky-tests.patch
Normal file
12
testresources-flaky-tests.patch
Normal file
@@ -0,0 +1,12 @@
|
||||
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
|
||||
@@ -498,6 +498,7 @@ class TestGraphStuff(testtools.TestCase)
|
||||
permutations.append([case4, case1, case3, case2])
|
||||
return permutations
|
||||
|
||||
+ @unittest.skip("too flaky")
|
||||
def testBasicSortTests(self):
|
||||
# Test every permutation of inputs, with legacy tests.
|
||||
# Cannot use equal costs because of the use of
|
||||
Reference in New Issue
Block a user