diff --git a/.gitignore b/.gitignore index adc2300..50cff98 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /httmock-1.2.6.tar.gz +/httmock-1.3.0.tar.gz +/httmock-1.4.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..1d68e68 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,25 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +upstream_project_url: https://github.com/patrys/httmock +copy_upstream_release_description: false +upstream_tag_include: '^\d+\.\d+\.\d+$' + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-rawhide + - epel10 + - job: koji_build + trigger: commit + allowed_committers: ['packit','all_admins'] + dist_git_branches: + - fedora-rawhide + - epel10 + - job: bodhi_update + trigger: commit + allowed_builders: ['packit','all_users'] + dist_git_branches: + - fedora-rawhide diff --git a/64.diff b/64.diff new file mode 100644 index 0000000..7755b76 --- /dev/null +++ b/64.diff @@ -0,0 +1,19 @@ +diff --git a/tox.ini b/tox.ini +new file mode 100644 +index 0000000..e781a62 +--- /dev/null ++++ b/tox.ini +@@ -0,0 +1,13 @@ ++# Tox (https://tox.readthedocs.io) is a tool for running tests ++# in multiple virtualenvs. This configuration file will run the ++# test suite on all supported Python versions. To use it, ++# "python -m pip install tox" and then run "tox" from this directory. ++ ++[tox] ++envlist = py{27, 34, 35, 36, 37, 38, 39, 310, 311, py2, py3} ++ ++[testenv] ++deps = ++ pytest ++ requests ++commands = {envpython} -b -m pytest -W always tests.py {posargs} diff --git a/changelog b/changelog new file mode 100644 index 0000000..29ef604 --- /dev/null +++ b/changelog @@ -0,0 +1,92 @@ +* Sat Jan 18 2025 Fedora Release Engineering - 1.4.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Fri Jul 19 2024 Fedora Release Engineering - 1.4.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Jun 07 2024 Python Maint - 1.4.0-14 +- Rebuilt for Python 3.13 + +* Fri Jan 26 2024 Fedora Release Engineering - 1.4.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.4.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 1.4.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 14 2023 Python Maint - 1.4.0-10 +- Rebuilt for Python 3.12 + +* Fri May 05 2023 Steve Traylen 1.4.0-9 +- Complete migration to pyproject macros +- Switch SPDX license field +- Use tests.py matching released version of module (rhbz#2175195) + +* Fri Jan 20 2023 Fedora Release Engineering - 1.4.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Fri Jul 22 2022 Fedora Release Engineering - 1.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 13 2022 Python Maint - 1.4.0-6 +- Rebuilt for Python 3.11 + +* Fri Jan 28 2022 Steve Traylen 1.4.0-5 +- Migrate tests to tox rhbz#2019409 + +* Fri Jan 21 2022 Fedora Release Engineering - 1.4.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 1.4.0-2 +- Rebuilt for Python 3.10 + +* Mon Mar 8 2021 Steve Traylen - 1.4.0-1 +- Update to 1.4.0 + +* Wed Jan 27 2021 Fedora Release Engineering - 1.3.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.3.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 1.3.0-3 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Nov 13 2019 Steve Traylen - 1.3.0-1 +- Update to 1.3.0 + +* Thu Oct 03 2019 Miro Hrončok - 1.2.6-9 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 1.2.6-8 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 1.2.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 1.2.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jan 04 2019 Igor Gnatenko - 1.2.6-5 +- Enable python dependency generator + +* Fri Jan 04 2019 Miro Hrončok - 1.2.6-4 +- Subpackage python2-httmock has been removed + See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal + +* Sat Jul 14 2018 Fedora Release Engineering - 1.2.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 1.2.6-2 +- Rebuilt for Python 3.7 + +* Fri May 11 2018 Steve Traylen - 1.2.6-1 +- Initial package. diff --git a/python-httmock.spec b/python-httmock.spec index bcef5eb..596edac 100644 --- a/python-httmock.spec +++ b/python-httmock.spec @@ -1,73 +1,60 @@ -%{?python_enable_dependency_generator} -# Created by pyp2rpm-3.3.0 -%global pypi_name httmock - -Name: python-%{pypi_name} -Version: 1.2.6 -Release: 6%{?dist} +Name: python-httmock +Version: 1.4.0 +Release: %autorelease Summary: A mocking library for requests - -License: ASL 2.0 +License: Apache-2.0 URL: https://github.com/patrys/httmock + +# Switch to github at next release to avoid the extra Source1 Source0: https://files.pythonhosted.org/packages/source/h/httmock/httmock-%{version}.tar.gz Source1: https://raw.githubusercontent.com/patrys/httmock/%{version}/tests.py + +# Add a tox file. +# https://bugzilla.redhat.com/show_bug.cgi?id=2019409 +Patch0: https://patch-diff.githubusercontent.com/raw/patrys/httmock/pull/64.diff BuildArch: noarch -%description +%global _description %{expand: A mocking library for requests for Python. You can use it to mock third-party APIs and test libraries -that use requests internally. +that use requests internally} -%package -n python3-%{pypi_name} + +%description %_description + +%package -n python3-httmock Summary: %{summary} -%{?python_provide:%python_provide python3-%{pypi_name}} BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3dist(requests) >= 1.0.0 - -%description -n python3-%{pypi_name} -A mocking library for requests for Python. -You can use it to mock third-party APIs and test libraries -that use requests internally. + +%description -n python3-httmock %_description + %prep -%autosetup -n %{pypi_name}-%{version} -# Remove bundled egg-info -rm -rf %{pypi_name}.egg-info +%autosetup -p1 -n httmock-%{version} cp %{SOURCE1} . +%generate_buildrequires +%pyproject_buildrequires -t + + %build -%py3_build +%pyproject_wheel + %install -%py3_install +%pyproject_install + +%pyproject_save_files httmock + %check -%{__python3} setup.py test +%{tox} -%files -n python3-%{pypi_name} + +%files -n python3-httmock -f %{pyproject_files} %license LICENSE %doc README.md -%{python3_sitelib}/__pycache__/* -%{python3_sitelib}/%{pypi_name}.py -%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info + %changelog -* Sat Feb 02 2019 Fedora Release Engineering - 1.2.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 04 2019 Igor Gnatenko - 1.2.6-5 -- Enable python dependency generator - -* Fri Jan 04 2019 Miro Hrončok - 1.2.6-4 -- Subpackage python2-httmock has been removed - See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal - -* Sat Jul 14 2018 Fedora Release Engineering - 1.2.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 1.2.6-2 -- Rebuilt for Python 3.7 - -* Fri May 11 2018 Steve Traylen - 1.2.6-1 -- Initial package. +%autochangelog diff --git a/sources b/sources index be3e2e0..3d1b8d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (httmock-1.2.6.tar.gz) = a31b4a28383c052bb15ca5c2f07f96c8654f44d15df05fa7972e410b9c1a40f70c6ed48256dd7cf3a0486f8555142ba59330edd9c8beb003785ecdb535ddfb69 +SHA512 (httmock-1.4.0.tar.gz) = d8674c0bd7c667d02e100f35157f717189ddcfb14d26993a87e8823aec255d191ab6ac53da0cb4035eb37caab36f8f7c6705bf10f0d8d4de62a5aa09cddacfc4 diff --git a/tests.py b/tests.py index 7a13cb3..9d4cabb 100644 --- a/tests.py +++ b/tests.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import requests import unittest @@ -41,6 +42,22 @@ def facebook_mock(url, request): def facebook_mock_count(url, request): return 'Hello from Facebook' +@urlmatch(netloc=r'(.*\.)?google\.com$', path=r'^/$', method='POST') +@remember_called +def google_mock_store_requests(url, request): + return 'Posting at Google' + + +@all_requests +def charset_utf8(url, request): + return { + 'content': u'Motörhead'.encode('utf-8'), + 'status_code': 200, + 'headers': { + 'Content-Type': 'text/plain; charset=utf-8' + } + } + def any_mock(url, request): return 'Hello from %s' % (url.netloc,) @@ -49,7 +66,8 @@ def any_mock(url, request): def dict_any_mock(url, request): return { 'content': 'Hello from %s' % (url.netloc,), - 'status_code': 200 + 'status_code': 200, + 'http_vsn': 10, } @@ -112,6 +130,20 @@ class MockTest(unittest.TestCase): with HTTMock(response_content): self.assertRaises(TypeError, requests.get, 'http://example.com/') + def test_encoding_from_contenttype(self): + with HTTMock(charset_utf8): + r = requests.get('http://example.com/') + self.assertEqual(r.encoding, 'utf-8') + self.assertEqual(r.text, u'Motörhead') + self.assertEqual(r.content, r.text.encode('utf-8')) + + def test_has_raw_version(self): + with HTTMock(any_mock): + r = requests.get('http://example.com') + self.assertEqual(r.raw.version, 11) + with HTTMock(dict_any_mock): + r = requests.get('http://example.com') + self.assertEqual(r.raw.version, 10) class DecoratorTest(unittest.TestCase): @@ -218,6 +250,11 @@ class ResponseTest(unittest.TestCase): r = response(200, None, {'Content-Type': 'application/json'}) self.assertEqual(r.headers['content-type'], 'application/json') + def test_response_raw_version(self): + r = response(200, None, {'Content-Type': 'application/json'}, + http_vsn=10) + self.assertEqual(r.raw.version, 10) + def test_response_cookies(self): @all_requests def response_content(url, request): @@ -244,6 +281,18 @@ class ResponseTest(unittest.TestCase): self.assertTrue('foo' in session.cookies) self.assertEqual(session.cookies['foo'], 'bar') + def test_session_persistent_cookies(self): + session = requests.Session() + with HTTMock(lambda u, r: response(200, 'Foo', {'Set-Cookie': 'foo=bar;'}, request=r)): + session.get('https://foo_bar') + with HTTMock(lambda u, r: response(200, 'Baz', {'Set-Cookie': 'baz=qux;'}, request=r)): + session.get('https://baz_qux') + self.assertEqual(len(session.cookies), 2) + self.assertTrue('foo' in session.cookies) + self.assertEqual(session.cookies['foo'], 'bar') + self.assertTrue('baz' in session.cookies) + self.assertEqual(session.cookies['baz'], 'qux') + def test_python_version_encoding_differences(self): # Previous behavior would result in this test failing in Python3 due # to how requests checks for utf-8 JSON content in requests.utils with: @@ -317,7 +366,7 @@ class RememberCalledTest(unittest.TestCase): results = self.several_calls( 1, requests.get, 'http://facebook.com/') - self.assertEquals(facebook_mock_count.call['count'], 1) + self.assertEqual(facebook_mock_count.call['count'], 1) @with_httmock(google_mock_count, facebook_mock_count) def test_several_call_decorated(self): @@ -333,4 +382,14 @@ class RememberCalledTest(unittest.TestCase): self.assertEqual(r.content, b'Hello from Facebook') self.several_calls(1, requests.get, 'http://facebook.com/') - self.assertEquals(facebook_mock_count.call['count'], 4) + self.assertEqual(facebook_mock_count.call['count'], 4) + + def test_store_several_requests(self): + with HTTMock(google_mock_store_requests): + payload = {"query": "foo"} + requests.post('http://google.com', data=payload) + + self.assertTrue(google_mock_store_requests.call['called']) + self.assertEqual(google_mock_store_requests.call['count'], 1) + request = google_mock_store_requests.call['requests'][0] + self.assertEqual(request.body, 'query=foo')