14
0

Accepting request 1230054 from home:mcalabkova:branches:devel:languages:python

- Add patch py313.patch to fix test failure

OBS-URL: https://build.opensuse.org/request/show/1230054
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-osc-tiny?expand=0&rev=116
This commit is contained in:
2024-12-11 10:34:55 +00:00
committed by Git OBS Bridge
parent 7d9fbcc11a
commit 1d35003344
3 changed files with 64 additions and 4 deletions

51
py313.patch Normal file
View File

@@ -0,0 +1,51 @@
From 791ffb58cf8b1c09ee4d4a24b47f25e4d826f1e7 Mon Sep 17 00:00:00 2001
From: frozenIceage <ChHuang@suse.com>
Date: Wed, 27 Nov 2024 11:58:48 +0100
Subject: [PATCH] fix test failure in PY13
---
osctiny/tests/test_utils.py | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/osctiny/tests/test_utils.py b/osctiny/tests/test_utils.py
index 10769f3..2a90ad0 100644
--- a/osctiny/tests/test_utils.py
+++ b/osctiny/tests/test_utils.py
@@ -245,23 +245,20 @@ def test_write(self):
self.assertEqual(len(cl.entries), 3)
cl.write(path="/who/cares/test.changes")
-
- self.assertEqual(len(omock.mock_calls), 6)
- content = "".join(str(omock.mock_calls[x][1][0])
- for x in range(2, 5))
-
- self.assertEqual(
- content,
- "-------------------------------------------------------------------\n"
- "Tue Jan 01 00:00:00 UTC 2019 - Andreas Hasenkopf <ahasenkopf@suse.com>\n\n"
- "Føø Bar\n\n"
- "-------------------------------------------------------------------\n"
- "Mon Jan 01 00:00:00 UTC 2018 - Andreas Pritschet <apritschet@suse.com>\n\n"
- "Hellø Wørld\n\n"
- "-------------------------------------------------------------------\n"
- "Sun Jan 01 00:00:00 UTC 2017 - Andreas Hasenkopf <ahasenkopf@suse.com>\n\n"
- "First enŧry\n\n"
- )
+ calls = [
+ mock.call().write(
+ '-------------------------------------------------------------------\n'
+ 'Tue Jan 01 00:00:00 UTC 2019 - Andreas Hasenkopf <ahasenkopf@suse.com>'
+ '\n\nFøø Bar\n\n'),
+ mock.call().write(
+ '-------------------------------------------------------------------\n'
+ 'Mon Jan 01 00:00:00 UTC 2018 - Andreas Pritschet <apritschet@suse.com>'
+ '\n\nHellø Wørld\n\n'),
+ mock.call().write(
+ '-------------------------------------------------------------------\n'
+ 'Sun Jan 01 00:00:00 UTC 2017 - Andreas Hasenkopf <ahasenkopf@suse.com>'
+ '\n\nFirst enŧry\n\n')]
+ omock.assert_has_calls(calls, any_order=True)
def test_write_stringio(self):
buffer = StringIO("")

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 10 17:21:22 UTC 2024 - Markéta Machová <mmachova@suse.com>
- Add patch py313.patch to fix test failure
-------------------------------------------------------------------
Tue Nov 26 12:38:28 UTC 2024 - maintenance-obs-robot <maintenance-automation-team@suse.de>

View File

@@ -26,14 +26,18 @@ License: MIT
Group: Development/Languages/Python
URL: https://github.com/SUSE/osc-tiny
Source: https://files.pythonhosted.org/packages/source/o/osc-tiny/osc_tiny-%{version}.tar.gz
# PATCH-FIX-UPSTREAM https://github.com/SUSE/osc-tiny/pull/204 fix test failure in PY13
Patch: py313.patch
BuildRequires: %{python_module PyYAML}
BuildRequires: %{python_module lxml}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module python-dateutil}
BuildRequires: %{python_module pytz}
BuildRequires: %{python_module requests}
BuildRequires: %{python_module responses}
BuildRequires: %{python_module setuptools}
BuildRequires: %{python_module urllib3}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: python-PyYAML
@@ -41,7 +45,7 @@ Requires: python-lxml
Requires: python-python-dateutil
Requires: python-pytz
Requires: python-requests
Requires: (python-cached-property if python-base < 3.8)
Requires: python-urllib3
Suggests: openssh
BuildArch: noarch
# Using 'if' instead of 'with' because the latter requires rpm >= 4.14
@@ -63,13 +67,13 @@ For further details see:
* https://build.opensuse.org/apidocs/index
%prep
%setup -q -n osc_tiny-%{version}
%autosetup -p1 -n osc_tiny-%{version}
%build
%python_build
%pyproject_wheel
%install
%python_install
%pyproject_install
%python_expand %fdupes %{buildroot}%{$python_sitelib}
%check