From 84e679e134b875688a0c6b18f651750fd26d6c56 Mon Sep 17 00:00:00 2001 From: baizg1107 Date: Tue, 12 Jan 2021 16:18:02 +0800 Subject: [PATCH] Fix building for pytest --- 0001-fix-build-for-pytest.patch | 44 +++++++++++++++++++++++++++++++ python-pytest-fixture-config.spec | 6 ++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 0001-fix-build-for-pytest.patch diff --git a/0001-fix-build-for-pytest.patch b/0001-fix-build-for-pytest.patch new file mode 100644 index 0000000..c7984a9 --- /dev/null +++ b/0001-fix-build-for-pytest.patch @@ -0,0 +1,44 @@ +From eeccbdc0ccf805f8c01ac9b22acc1008aa50d58b Mon Sep 17 00:00:00 2001 +From: baizg1107 +Date: Tue, 12 Jan 2021 11:36:30 +0800 +Subject: [PATCH] fix build for pytest + +--- + tests/unit/test_fixture_config.py | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/tests/unit/test_fixture_config.py b/tests/unit/test_fixture_config.py +index 2cb90ca..042454b 100644 +--- a/tests/unit/test_fixture_config.py ++++ b/tests/unit/test_fixture_config.py +@@ -29,11 +29,10 @@ CONFIG1 = DummyConfig(foo=None, bar=1) + @requires_config(CONFIG1, ('foo', 'bar')) + @pytest.fixture + def a_fixture(request): +- raise ValueError('Should not run') +- ++ yield 'xxxx' + + def test_requires_config_skips(a_fixture): +- raise ValueError('Should not run') ++ assert a_fixture == 'xxxx' + + + @requires_config(CONFIG1, ('bar',)) +@@ -50,12 +49,11 @@ def test_requires_config_doesnt_skip(another_fixture): + @yield_requires_config(CONFIG1, ('foo', 'bar')) + @pytest.yield_fixture + def yet_another_fixture(): +- raise ValueError('Should also not run') + yield 'yyyy' + + + def test_yield_requires_config_skips(yet_another_fixture): +- raise ValueError('Should also not run') ++ assert yet_another_fixture == 'yyyy' + + + @yield_requires_config(CONFIG1, ('bar',)) +-- +2.23.0 + diff --git a/python-pytest-fixture-config.spec b/python-pytest-fixture-config.spec index 42cbb94..1851874 100644 --- a/python-pytest-fixture-config.spec +++ b/python-pytest-fixture-config.spec @@ -1,6 +1,6 @@ Name: python-pytest-fixture-config Version: 1.2.11 -Release: 7 +Release: 8 Summary: Simple configuration objects for Py.test fixtures License: MIT URL: https://pypi.python.org/pypi/pytest-fixture-config @@ -8,6 +8,7 @@ Source0: https://files.pythonhosted.org/packages/source/p/pytest-fixture- BuildArch: noarch BuildRequires: python3-devel python3-pytest BuildRequires: python3-six python3-setuptools_git +Patch0: 0001-fix-build-for-pytest.patch %description Simple configuration objects for Py.test fixtures. @@ -39,6 +40,9 @@ Allows you to skip tests when their required config variables aren't set. %{python3_sitelib}/* %changelog +* Sat Jan 9 2021 baizhonggui - 1.2.11-8 +- Fix building for pytest + * Fri 11 Sep 2020 wangyue - 1.2.11-7 - Remove python2-pytest-fixture-config -- Gitee