From d288f33447893ac7afe17480cc6dfc74ae0f0b47 Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Dec 04 2019 16:04:34 +0000 Subject: Remove obsolete patch Signed-off-by: Aurélien Bompard --- diff --git a/bodhi-tests-rawhide.patch b/bodhi-tests-rawhide.patch deleted file mode 100644 index b4e1902..0000000 --- a/bodhi-tests-rawhide.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit d9176570166e0b0cac14af7f0789476fca30a493 -Author: Aurélien Bompard -Date: Thu Jul 25 17:34:25 2019 +0200 - - Fix a couple tests on F31+ - - Signed-off-by: Aurélien Bompard - -diff --git a/bodhi/tests/client/test___init__.py b/bodhi/tests/client/test___init__.py -index a06780a3..3b824a17 100644 ---- a/bodhi/tests/client/test___init__.py -+++ b/bodhi/tests/client/test___init__.py -@@ -993,7 +993,14 @@ class TestQuery(unittest.TestCase): - ) - ] - self.assertEqual(send_request.mock_calls, calls) -- mock_open.assert_called_with(fedora.client.openidbaseclient.b_SESSION_FILE, 'rb') -+ # Before F31 the file was opened in binary mode, and then it changed. -+ # Only check the path. -+ self.assertNotEqual(mock_open.call_count, 0) -+ first_args = [args[0][0] for args in mock_open.call_args_list] -+ self.assertIn( -+ fedora.client.openidbaseclient.b_SESSION_FILE, -+ first_args -+ ) - - @mock.patch('bodhi.client.bindings.BodhiClient.csrf', - mock.MagicMock(return_value='a_csrf_token')) -@@ -1128,7 +1135,14 @@ class TestQueryBuildrootOverrides(unittest.TestCase): - ) - ] - self.assertEqual(send_request.mock_calls, calls) -- mock_open.assert_called_with(fedora.client.openidbaseclient.b_SESSION_FILE, 'rb') -+ # Before F31 the file was opened in binary mode, and then it changed. -+ # Only check the path. -+ self.assertNotEqual(mock_open.call_count, 0) -+ first_args = [args[0][0] for args in mock_open.call_args_list] -+ self.assertIn( -+ fedora.client.openidbaseclient.b_SESSION_FILE, -+ first_args -+ ) - - @mock.patch('bodhi.client.bindings.BodhiClient.csrf', - mock.MagicMock(return_value='a_csrf_token')) diff --git a/bodhi.spec b/bodhi.spec index 2df3cc7..58b9582 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -17,9 +17,6 @@ URL: https://github.com/fedora-infra/bodhi Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz #Source0: %{url}/archive/%{commit}/%{name}-%{commit}.tar.gz -# https://github.com/fedora-infra/bodhi/pull/3423 -Patch0: bodhi-tests-rawhide.patch - BuildRequires: python3-devel BuildRequires: python3-setuptools BuildRequires: %{py3_dist alembic}