diff --git a/python-flaky.changes b/python-flaky.changes index 34cfe47..1fa37ee 100644 --- a/python-flaky.changes +++ b/python-flaky.changes @@ -2,7 +2,7 @@ Fri Oct 20 10:57:54 UTC 2023 - Matej Cepl - Add remove_genty.patch to remove dependency on the external - genty package. + genty package (gh#box/flaky!197). ------------------------------------------------------------------- Fri Oct 20 10:26:48 UTC 2023 - Matej Cepl diff --git a/python-flaky.spec b/python-flaky.spec index 37f46e6..6bcd9c8 100644 --- a/python-flaky.spec +++ b/python-flaky.spec @@ -34,10 +34,10 @@ Source: https://files.pythonhosted.org/packages/source/f/flaky/flaky-%{v # PATCH-FEATURE-UPSTREAM remove_nose.patch gh#box/flaky#171 mcepl@suse.com # remove dependency on nose Patch0: remove_nose.patch -# PATCH-FEATURE-UPSTREAM remove_mock.patch bsc#[0-9]+ mcepl@suse.com +# PATCH-FEATURE-UPSTREAM remove_mock.patch gh#box/flaky!197 mcepl@suse.com # remove dependency on the external mock package Patch1: remove_mock.patch -# PATCH-FEATURE-UPSTREAM remove_genty.patch bsc#[0-9]+ mcepl@suse.com +# PATCH-FEATURE-UPSTREAM remove_genty.patch gh#box/flaky!197 mcepl@suse.com # remove dependency on the external genty package Patch2: remove_genty.patch BuildRequires: %{python_module setuptools} diff --git a/remove_genty.patch b/remove_genty.patch index cd5e222..5969a46 100644 --- a/remove_genty.patch +++ b/remove_genty.patch @@ -1,12 +1,12 @@ --- - test/test_flaky_plugin.py | 82 +++++++++++++++++------------------- + test/test_flaky_plugin.py | 83 +++++++++++++++++------------------- test/test_multiprocess_string_io.py | 51 +++++++++------------- test/test_utils.py | 17 +++---- - 3 files changed, 69 insertions(+), 81 deletions(-) + 3 files changed, 69 insertions(+), 82 deletions(-) --- a/test/test_flaky_plugin.py +++ b/test/test_flaky_plugin.py -@@ -2,17 +2,32 @@ +@@ -2,17 +2,31 @@ from __future__ import unicode_literals @@ -18,11 +18,11 @@ from flaky.names import FlakyNames -from genty import genty, genty_dataset -- +TestCaseDataset = namedtuple("TestCaseDataset", + ['max_runs', 'min_passes', 'current_runs', 'current_passes', 'expect_fail']) - @genty +- +-@genty class TestFlakyPlugin(TestCase): + _test_dataset = ( + "default_not_started": TestCaseDataset(2, 1, 0, 0, False), @@ -41,7 +41,7 @@ def setUp(self): super(TestFlakyPlugin, self).setUp() self._flaky_plugin = _FlakyPlugin() -@@ -28,43 +43,26 @@ class TestFlakyPlugin(TestCase): +@@ -28,43 +42,26 @@ class TestFlakyPlugin(TestCase): mock_message, )