!6 解决python-fixtures在22.03分支上python3.9 test fail问题

Merge pull request !6 from xigaoxinyan/openEuler-22.03-LTS-Next
This commit is contained in:
openeuler-ci-bot 2022-01-11 06:27:21 +00:00 committed by Gitee
commit fc1da44ce9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 51 additions and 2 deletions

View File

@ -0,0 +1,45 @@
From 2c87c998801c6ad3259a468ed815f72b2a11e508 Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Thu, 1 Oct 2020 10:59:41 +0200
Subject: [PATCH] Skip tests failing in Python 3.9
Two monkeypatch-related tests are failing in Python 3.9 [1]. While
the cause for the error is figured out, let's skip those two tests
if running in Python 3.9.
[1] - https://github.com/testing-cabal/fixtures/issues/44
---
fixtures/tests/_fixtures/test_monkeypatch.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fixtures/tests/_fixtures/test_monkeypatch.py b/fixtures/tests/_fixtures/test_monkeypatch.py
index 6f11fab..8e89b7a 100644
--- a/fixtures/tests/_fixtures/test_monkeypatch.py
+++ b/fixtures/tests/_fixtures/test_monkeypatch.py
@@ -14,6 +14,7 @@
# limitations under that license.
import functools
+import sys
import testtools
from testtools.matchers import Is
@@ -181,6 +182,7 @@ class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
self._check_restored_static_or_class_method(oldmethod, oldmethod_inst,
C, 'foo_cls')
+ @testtools.skipIf(sys.version_info > (3, 8), "Fails with Python 3.9")
def test_patch_classmethod_with_classmethod(self):
oldmethod = C.foo_cls
oldmethod_inst = C().foo_cls
@@ -212,6 +214,7 @@ class TestMonkeyPatch(testtools.TestCase, TestWithFixtures):
self._check_restored_static_or_class_method(oldmethod, oldmethod_inst,
C, 'foo_cls')
+ @testtools.skipIf(sys.version_info > (3, 8), "Fails with Python 3.9")
def test_patch_classmethod_with_boundmethod(self):
oldmethod = C.foo_cls
oldmethod_inst = C().foo_cls
--
2.26.2

View File

@ -1,10 +1,11 @@
Name: python-fixtures
Version: 3.0.0
Release: 14
Release: 15
Summary: A python contract for writing reusable state / support logic tests
License: ASL 2.0 or BSD
URL: https://launchpad.net/python-fixtures
Source0: https://pypi.python.org/packages/source/f/fixtures/fixtures-%{version}.tar.gz
Patch0001: 0001-Skip-tests-failing-in-Python-3.9.patch
BuildArch: noarch
%description
@ -25,7 +26,7 @@ for unit testing. It includes some helper and adaptation logic to write your
own fixtures using the fixtures contract.
%prep
%autosetup -n fixtures-%{version}
%autosetup -n fixtures-%{version} -p1
%build
%py3_build
@ -42,6 +43,9 @@ own fixtures using the fixtures contract.
%{python3_sitelib}/fixtures-%{version}-py?.?.egg-info
%changelog
* Jan Mon 10 2022 xigaoxinyan <xigaoxinyan@huawei.com> - 3.0.0-15
- add patch for Skip tests failing in Python 3.9
* Tue Sep 29 2020 liuweibo <liuweibo10@huawei.com> - 3.0.0-14
- Fix Source0