1
0
forked from pool/python-mocket

Accepting request 970633 from home:bnavigator:branches:devel:languages:python

- Add recording-urllib3-brotli.patch for test data because the
  new urllib3 for Tumbleweed accepts Brotli encoding by default
  rendering the recorded request differently.
- Upstream dropped Python 2 support. Skip python2 build for 15.3
- Refresh test ignores for SLE/Leap (not that it matters, the only
  Python 3.7 test is skipped by name globally)
- - Add Mocket "strict mode" (#171)
   * Add Mocket "strict mode".
 - Update main.yml
 - Introducing `request_list()` method (#170)
   * Introducing `request_list()` method.
 - Refactoring. (#169)
 - Some cleaning/refactoring (#168)
   * Some cleaning/refactoring.
   * Improving coverage.
 - Update README.rst
 - Use literal syntax instead of function calls to create data structure (#167)
   Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
- - Introducing `request_list()` method (#170)
   * Introducing `request_list()` method.
 - Refactoring. (#169)
 - Some cleaning/refactoring (#168)
   * Some cleaning/refactoring.
   * Improving coverage.
 - Update README.rst
 - Use literal syntax instead of function calls to create data structure (#167)
   Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
- Update to version 3.10.2:
 - Help the user to spot issues (#166)
   * Help to detect `register()` misusage.
   * Bump version.
   * Improve DeepSource scans.
 - Newer `pipenv` and GIT hooks (#165)
   * Newer GIT hooks.
 - Remove implicit `object` from the base class (#164)
   Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
 - Change methods not using its bound instance to staticmethods (#163)
   Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
 - Add .deepsource.toml
 - Replace `dict` call with comprehension (#162)
   Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
 - Refactor unnecessary `else` / `elif` when `if` block has a `return` statement (#161)
   Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
 - Remove unnecessary generator (#160)
   Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
 - Multi `register()` (#159)
   * Add failing test.
   * `Entry.collect` let us know if the response should be consumed or not.
   * Bump version.
 - Update README.rst
 - Update main.yml
 - In PYPI the package is old and broken
- Update to version 3.10.1:
 - Multi `register()` (#159)
   * Add failing test.
   * `Entry.collect` let us know if the response should be consumed or not.
   * Bump version.
 - Update README.rst
 - Update main.yml
 - In PYPI the package is old and broken
- update to version 3.10.0:
 - Fix for version number
 - Testing out Python 3.10 (#156)
   * Adding support for Python 3.10
 - Update LICENSE
 - Update main.yml
- remove obsolete kwsyntax.patch.
- Update to version 3.9.44:
 - Update __init__.py
 - Removing the constraint for `decorator`.
 - Update __init__.py (#155)
 - Patch from PR #150 (Refactored the mocketize decorator) (#153)
   * Patch from PR #150. Thanks to @micheles form the hints.
   * Complete refactor for using `decorator>=5`.
 - Update README.rs
- Add kwsyntax.patch to fix test failure with new decorator.
- Update to version 3.9.42:
 - Mock check_hostname everywhere (#152)
  * Fix for #151.
  * Complete refactoring.
- update to version 3.9.41:
 - A few refactors.
 - Adding `make setup` for local development.
 - Migrating package creation to using build.  Avoid decorator>=5 as dependency. (#149)
 - Avoid decorator>=5 as dependency. (#149)
- disable test test_asyncio_record_replay as it requires DNS.
- Update to version 3.9.40:
 - Fix for asyncio.open_connection() (#144)
 - fix UT for 3.5 support
- update to version 3.9.39:
 - Use MocketSocket as context manager (#141)
  * Adding support for using a `socket` as a context manager as requested by #139.
  * Closing real socket.
  * Bump version.
- update to version 3.9.38:
 - Update __init__.py
- update to version 3.9.37:
 - Fix for external decorators (#138)
- update to version 3.9.36:
 - New mocket method for checking if all entries have been served (#137)
 * Mocket method for checking if all entries have been served at least once.
 - Yet another refactor (#135)
 - Refactor. (#136)
- update to version 3.9.35:
 - Removing Python 2 compatibility layer (#134).
- Do not require and test with pook on Python2
- Update to version 3.9.4
  * fix for new version of pip resolver
- Skip python38 only tests in python36 flavor and python3 flavor
  if python3 <= 3.8 (Leap)
- Relax pinned setup.py requires so that the installed egg-info
  does not interfere with other packages
- Update to version 3.9.3:
 * Fix for `.makefile()` as reported by @KyleKing.
 * From `codecs` to `binascii` for PyPy. (#127)
- Update to version 3.9.2:
 * Mocket raises exceptions.
 * Fix for Python 2.
- Update to version 3.9.1:
 - Multiple HTTP writes (#125)
 - Fix for #111.
- Update to version 3.9.0:
 - MockHTTP uses `http-parser` as parser
   Fix for second sendall used for delivering request's body.
- Update to version 3.8.9:
 - Small refactor for HTTPretty plugin
   Now the import line can be written as from mocket.plugins.httpretty import httpretty, httprettified.
- Update to version 3.8.8:
 - Small fix applied to `setup.py`
- Update to version 3.8.7
  * This version ships the change to support the libmagic wrapper
    distributed with file's command.
 
- Switch to multibuild as we create cycle with python-pook otherwise
- Change requirements version specifier from == to >=.
- Update to version 3.8.6:
 - No upstream changelog available
- Use source tarball from pypi instead of GitHub.
- version update to 3.8.4
  * Adding missing `load_verify_locations` method
  * Removing `hexdump` dependency
  * Fix for removing DeprecationWarning (#105)
  * Py3.8 classifier
  * Fix for Redis module
- Update to 3.7.3:
  * testsuite fixes
- Drop patch partial-wildcards.patch
- Activate test suite
- Add patch partial-wildcards.patch
- Update to v3.7.2
- Initial spec for v2.7.2

OBS-URL: https://build.opensuse.org/request/show/970633
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-mocket?expand=0&rev=43
This commit is contained in:
Matej Cepl 2022-04-18 22:34:38 +00:00 committed by Git OBS Bridge
parent 1b295dc41f
commit 4fdb1b2da4
3 changed files with 108 additions and 18 deletions

View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Apr 18 19:31:43 UTC 2022 - Ben Greiner <code@bnavigator.de>
- Add recording-urllib3-brotli.patch for test data because the
new urllib3 for Tumbleweed accepts Brotli encoding by default
rendering the recorded request differently.
- Upstream dropped Python 2 support. Skip python2 build for 15.3
- Refresh test ignores for SLE/Leap (not that it matters, the only
Python 3.7 test is skipped by name globally)
-------------------------------------------------------------------
Sun Jan 9 19:21:59 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
@ -8,7 +18,7 @@ Sun Jan 9 19:21:59 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
* Introducing `request_list()` method.
- Refactoring. (#169)
- Some cleaning/refactoring (#168)
* Some cleaning/refactoring.
* Some cleaning/refactoring.
* Improving coverage.
- Update README.rst
- Use literal syntax instead of function calls to create data structure (#167)
@ -21,7 +31,7 @@ Sat Jan 8 21:39:28 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
* Introducing `request_list()` method.
- Refactoring. (#169)
- Some cleaning/refactoring (#168)
* Some cleaning/refactoring.
* Some cleaning/refactoring.
* Improving coverage.
- Update README.rst
- Use literal syntax instead of function calls to create data structure (#167)

View File

@ -16,7 +16,6 @@
#
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%global flavor @BUILD_FLAVOR@%{nil}
%if "%{flavor}" == "test"
%define psuffix -test
@ -25,6 +24,8 @@
%define psuffix %{nil}
%bcond_with test
%endif
%{?!python_module:%define python_module() python3-%{**}}
%define skip_python2 1
Name: python-mocket%{psuffix}
Version: 3.10.4
Release: 0
@ -32,6 +33,8 @@ Summary: Python socket mock framework
License: BSD-3-Clause
URL: https://github.com/mindflayer/python-mocket
Source0: https://files.pythonhosted.org/packages/source/m/mocket/mocket-%{version}.tar.gz
# PATCH-FIX-OPENSUSE recording-urllib3-brotli.patch -- our urllib has different default headers than upstreams test reference, code@bnavigator.de
Patch0: recording-urllib3-brotli.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@ -48,29 +51,23 @@ Suggests: python-xxhash
BuildArch: noarch
%if %{with test}
BuildRequires: %{python_module PySocks}
BuildRequires: %{python_module aiohttp}
BuildRequires: %{python_module async_timeout}
BuildRequires: %{python_module cryptography}
BuildRequires: %{python_module decorator}
BuildRequires: %{python_module gevent}
BuildRequires: %{python_module http-parser >= 0.9.0}
BuildRequires: %{python_module mock}
%if 0%{suse_version} >= 1550
# Optional pook is only available for Python 3, but in TW we will have more than one flavor
BuildRequires: %{python_module pook}
%else
BuildRequires: python3-pook
%endif
BuildRequires: %{python_module pyOpenSSL}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module python-magic}
BuildRequires: %{python_module redis}
BuildRequires: %{python_module requests}
BuildRequires: %{python_module six}
BuildRequires: %{python_module sure}
BuildRequires: %{python_module urllib3}
BuildRequires: %{python_module xxhash}
BuildRequires: ca-certificates-mozilla
BuildRequires: python3-aiohttp
BuildRequires: python3-async_timeout
%endif
%python_subpackages
@ -82,7 +79,10 @@ included, with gevent/asyncio/SSL support.
%setup -q -n mocket-%{version}
sed -i '/cov/ d' setup.cfg
sed -i '/pipenv/ d' setup.py
sed -i 's/==.*$//' requirements.txt
%if 0%{suse_version} >= 1550
# urllib3 in TW accepts Brotli encoding by default
%patch0 -p1
%endif
%build
%if !%{with test}
@ -101,13 +101,15 @@ export LANG=en_US.UTF-8
%if %{with test}
export LANG=en_US.UTF-8
export SKIP_TRUE_HTTP=1
pytest_python2_ignore="--ignore tests/tests35 --ignore tests/tests38 --ignore tests/main/test_pook.py"
pytest_python36_ignore="--ignore tests/tests38"
%if %{python3_version_nodots} < 38
pytest_python3_ignore="--ignore tests/tests38"
%if 0%{?suse_version} < 1550
# Ignore tests which are not supported on Python 3.6
pytest_python3_ignore="--ignore tests/tests37 --ignore tests/tests38"
%endif
# test_asyncio_record_replay requires DNS ("Temporary failure in name resolution")
%pytest -k 'not RedisTestCase and not test_asyncio_record_replay' ${pytest_$python_ignore}
# Requires a running Redis server
donttest="TrueRedisTestCase"
# Checks the ability to record a real request and response. Not available inside obs.
donttest="$donttest or test_asyncio_record_replay"
%pytest -k "not ($donttest)" ${pytest_$python_ignore}
%endif
%if !%{with test}

View File

@ -0,0 +1,78 @@
Only in mocket-3.10.4.r/tests/main/: __pycache__
diff -ur mocket-3.10.4/tests/main/tests.main.test_http_gevent.GeventHttpEntryTestCase.test_truesendall_with_dump_from_recording.json mocket-3.10.4.r/tests/main/tests.main.test_http_gevent.GeventHttpEntryTestCase.test_truesendall_with_dump_from_recording.json
--- mocket-3.10.4/tests/main/tests.main.test_http_gevent.GeventHttpEntryTestCase.test_truesendall_with_dump_from_recording.json 2021-03-20 19:51:56.000000000 +0100
+++ mocket-3.10.4.r/tests/main/tests.main.test_http_gevent.GeventHttpEntryTestCase.test_truesendall_with_dump_from_recording.json 2022-04-18 21:27:26.129834821 +0200
@@ -1,14 +1,14 @@
{
- "httpbin.org": {
- "80": {
- "31ae71d6074aa0e73fb4feb91f28546a": {
- "request": "GET /gzip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
- "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 44 61 74 65 3A 20 4D 6F 6E 2C 20 31 35 20 4A 75 6E 20 32 30 32 30 20 31 36 3A 31 39 3A 34 32 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 34 39 31 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 73 65 72 76 65 72 3A 20 69 73 74 69 6F 2D 65 6E 76 6F 79 0D 0A 63 6F 6E 74 65 6E 74 2D 65 6E 63 6F 64 69 6E 67 3A 20 67 7A 69 70 0D 0A 61 63 63 65 73 73 2D 63 6F 6E 74 72 6F 6C 2D 61 6C 6C 6F 77 2D 6F 72 69 67 69 6E 3A 20 2A 0D 0A 61 63 63 65 73 73 2D 63 6F 6E 74 72 6F 6C 2D 61 6C 6C 6F 77 2D 63 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 78 2D 65 6E 76 6F 79 2D 75 70 73 74 72 65 61 6D 2D 73 65 72 76 69 63 65 2D 74 69 6D 65 3A 20 32 0D 0A 0D 0A 1F 8B 08 00 9E 9F E7 5E 02 FF 7D 52 CB 6E DB 30 10 BC FB 2B 0C 1D 03 53 A2 44 EA 15 C3 07 C7 70 9A 00 3D 14 79 00 3D E4 B2 22 57 B2 5A 99 14 48 3A A9 13 E4 DF 4B C9 8D EA 5C 72 DC D9 E1 70 77 76 DE 66 F3 79 D0 BC B6 7D 8F 32 B8 9C 3B 73 C0 C5 7C C0 76 08 12 8D F5 D8 9B 2F 3D B0 16 02 7B E7 EB E0 22 BA 08 46 D2 84 92 AD 12 5A B6 AA 19 DA 83 DA 62 2E B1 EE C0 E1 44 DC 68 E5 50 39 F2 1D 55 E3 76 03 8F 4E BD 1B 6D 47 E1 9D 73 7D D5 AA 50 9B 66 EA 3D 5A 34 64 DD F8 A7 03 E3 1A 7E 23 39 83 3E 58 3F C9 7A FF AA C8 83 01 81 E4 76 D8 24 B8 D3 DA AD 62 92 22 E6 65 5D 22 C9 81 A7 09 24 05 8D 19 4B 91 49 46 53 4C 0A 80 33 8D 2B 46 7E 80 F1 BA B6 07 D5 8E 2A 92 E6 82 97 AC AA 93 8A F3 94 FD 9F 79 64 DF C3 BE EF 46 E3 CE B6 39 75 26 05 CE 38 16 34 C7 18 4B 9A 15 50 7F E6 8D 13 9F 88 05 CB CA 18 21 CF B8 A0 09 72 FE C5 D7 5B F5 AC 8F 64 FB C7 A1 51 D0 91 B5 94 06 ED 70 AB 20 A6 61 4C 69 58 64 21 CF CF 1E 5C 6B F3 02 46 A2 24 9B AE 1D CE B0 41 33 1A 7A 75 5C D9 BE AD 6B BC 8C 22 D1 1D AC 57 0C 3B 2D A0 8B 94 8D FE DD 83 B4 D6 B5 3A B2 F0 01 2C 6F C0 EE 56 B4 4A CB 5A F2 9A C7 59 46 65 21 A1 A6 32 66 39 A7 7E 83 2C A7 59 05 34 A7 B2 64 09 02 67 58 F2 B4 4E 68 2D 53 19 C7 49 2E 52 81 CB FB 43 F5 0B 85 5B 3D 05 4F C1 F2 F1 EE F6 8B 49 C6 09 88 3D 7A 74 3F 0C 72 AA 7D E0 86 BD 1B 9F B3 17 38 12 1F 8B E7 D6 DF 1F 84 D0 07 1F 0E BF FC FB 29 CC 7B 74 3B 3D 9A FC 6D FB 70 B2 25 D0 A6 6D 5A 35 7A 56 14 61 92 85 49 5C 86 3E 1B 8B 4F 16 CE DE 67 7F 01 78 59 1B AD 23 03 00 00"
- },
- "eaa1896a5d6eed6d4dd83a6696efc485": {
- "request": "GET /ip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
- "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 44 61 74 65 3A 20 4D 6F 6E 2C 20 31 35 20 4A 75 6E 20 32 30 32 30 20 31 36 3A 31 39 3A 34 32 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 34 36 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 73 65 72 76 65 72 3A 20 69 73 74 69 6F 2D 65 6E 76 6F 79 0D 0A 61 63 63 65 73 73 2D 63 6F 6E 74 72 6F 6C 2D 61 6C 6C 6F 77 2D 6F 72 69 67 69 6E 3A 20 2A 0D 0A 61 63 63 65 73 73 2D 63 6F 6E 74 72 6F 6C 2D 61 6C 6C 6F 77 2D 63 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 78 2D 65 6E 76 6F 79 2D 75 70 73 74 72 65 61 6D 2D 73 65 72 76 69 63 65 2D 74 69 6D 65 3A 20 31 0D 0A 0D 0A 7B 0A 20 20 22 6F 72 69 67 69 6E 22 3A 20 22 31 38 38 2E 32 36 2E 32 31 39 2E 31 33 33 2C 31 30 2E 31 30 30 2E 38 36 2E 34 37 22 0A 7D 0A"
- }
+ "httpbin.org": {
+ "80": {
+ "1971811efc86ef5b99b1ecbeed3ed472": {
+ "request": "GET /gzip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate, br\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
+ "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 44 61 74 65 3A 20 4D 6F 6E 2C 20 31 38 20 41 70 72 20 32 30 32 32 20 31 39 3A 32 37 3A 32 35 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 32 32 34 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 43 6F 6E 74 65 6E 74 2D 45 6E 63 6F 64 69 6E 67 3A 20 67 7A 69 70 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 0D 0A 1F 8B 08 00 9D BB 5D 62 02 FF 4D 8F B1 6E 83 30 10 86 77 9E C2 F2 88 30 C5 A4 18 A7 52 07 06 DA 66 AD 12 A9 AB C1 57 63 B5 D8 C8 B8 0B 28 EF 1E 9B 28 A8 E3 FF DD 7F 9F EE D6 04 21 AC 16 3D 4D 20 F1 0B F2 EE 0F 32 14 D9 00 42 82 9B 03 5B 43 0C A0 E9 7B 98 7C C8 38 7D 4A F1 56 DA 29 69 4D 6F A5 36 2A 8E A3 2D 43 12 BE 7F 85 0F B2 CE ED E5 0F 3B 6F 82 C1 FB A9 D3 26 B7 4E ED B3 CB 0C 8E 34 0A CC D6 78 13 3F 40 FE A1 47 EB 8B 34 E3 62 C8 D9 89 1E C8 29 5E 8C 3F AD F5 AF 94 B0 B2 92 5D 77 94 A4 A4 9C 43 5D 8B 4A 4A 56 17 05 A3 82 D7 07 C6 0F 38 18 AE F7 DF 46 F0 83 DD 96 DF DB F3 DD 8D AD D3 4A 9B C8 28 AF 72 CA 8A BC 2C 68 4E 9F 8F 38 B9 26 37 AD 5D EF 7E 26 01 00 00"
+ },
+ "e9d0e7557a215fc11bb4d9fc08bdddf6": {
+ "request": "GET /ip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate, br\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
+ "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 44 61 74 65 3A 20 4D 6F 6E 2C 20 31 38 20 41 70 72 20 32 30 32 32 20 31 39 3A 32 37 3A 32 35 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 33 34 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 0D 0A 7B 0A 20 20 22 6F 72 69 67 69 6E 22 3A 20 22 31 38 35 2E 31 36 30 2E 32 30 31 2E 31 34 39 22 0A 7D 0A"
+ }
+ }
}
- }
-}
+}
\ No newline at end of file
diff -ur mocket-3.10.4/tests/main/tests.main.test_http.HttpEntryTestCase.test_truesendall_with_dump_from_recording.json mocket-3.10.4.r/tests/main/tests.main.test_http.HttpEntryTestCase.test_truesendall_with_dump_from_recording.json
--- mocket-3.10.4/tests/main/tests.main.test_http.HttpEntryTestCase.test_truesendall_with_dump_from_recording.json 2021-03-20 19:51:56.000000000 +0100
+++ mocket-3.10.4.r/tests/main/tests.main.test_http.HttpEntryTestCase.test_truesendall_with_dump_from_recording.json 2022-04-18 21:27:25.409818481 +0200
@@ -1,13 +1,13 @@
{
"httpbin.org": {
"80": {
- "31ae71d6074aa0e73fb4feb91f28546a": {
- "request": "GET /gzip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
- "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 44 61 74 65 3A 20 54 75 65 2C 20 30 31 20 4A 61 6E 20 32 30 31 39 20 31 34 3A 35 32 3A 30 33 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 31 38 33 0D 0A 43 6F 6E 74 65 6E 74 2D 45 6E 63 6F 64 69 6E 67 3A 20 67 7A 69 70 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 56 69 61 3A 20 31 2E 31 20 76 65 67 75 72 0D 0A 0D 0A 1F 8B 08 00 93 7E 2B 5C 02 FF 4D 8F 4D 0E 82 30 10 46 F7 9C A2 E9 92 40 0D 92 68 74 47 0C EA 01 F4 00 D8 8E A5 01 3B 4D 5B 37 12 EE 6E 5B 12 74 39 EF 7B F3 37 65 84 50 F9 51 C6 80 A0 47 E2 ED 1B 0A 12 59 0F 9D 00 EB 02 9B 42 19 40 C3 39 18 1F 6A 9A 6F 72 9A A4 95 96 AD E6 28 94 96 31 8E D3 0A 22 E0 39 76 1E 56 F1 84 5A 03 F7 0A 75 74 F8 88 EE 97 5D D1 A5 C1 BD F7 E6 A1 34 43 2B D7 EC EE C0 96 8D 04 9D 8C 73 37 40 F9 87 82 33 2F F7 BE C0 F7 18 5F A0 97 F6 B6 74 53 B4 4A AA B4 EF 50 B3 6A BF 63 55 5D B1 7A 4B B3 39 FB 02 0D D4 A4 0E F8 00 00 00"
+ "1971811efc86ef5b99b1ecbeed3ed472": {
+ "request": "GET /gzip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate, br\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
+ "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 44 61 74 65 3A 20 4D 6F 6E 2C 20 31 38 20 41 70 72 20 32 30 32 32 20 31 39 3A 32 37 3A 32 35 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 32 32 34 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 43 6F 6E 74 65 6E 74 2D 45 6E 63 6F 64 69 6E 67 3A 20 67 7A 69 70 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 0D 0A 1F 8B 08 00 9D BB 5D 62 02 FF 4D 8F 3D 6F C3 20 10 86 77 FF 0A C4 18 05 07 5C 1B 25 91 3A 78 48 9B AE 55 2A 75 E5 E3 C0 28 0D 58 98 2C 89 F2 DF 0B 8E 6A 75 7C 9F 7B EF D1 DD BD 42 08 DB 9B 1B 47 D0 78 8F 52 BC C2 1A 15 36 80 D0 10 A7 CC EE 39 66 D0 2B 05 63 CA 19 AF 36 2B 3C 97 16 4A 0E 5E 05 ED BC 2D E3 62 5B 23 0D E6 47 A4 2C 93 71 29 1F C3 34 0B 86 94 46 E9 7C 1D A2 5D 66 5F 13 44 D2 5B F0 73 E3 4D 9C 81 FC 43 7F AD 6F D2 5F 6E 9E 9C A2 50 40 3E CA C5 F8 33 84 F4 CA 08 6F 3A 2D E5 4E 13 CE 41 1B 61 1A CA D5 F6 A5 E1 92 9A D6 B4 D4 74 38 1B 1E CF DF 2E 90 86 30 2F BF 1F 4E 4F 37 0E D1 59 E7 0B 63 DB AE 66 9C D6 0D 65 35 6B 77 B8 7A 54 BF AD 21 2B 2C 26 01 00 00"
},
- "eaa1896a5d6eed6d4dd83a6696efc485": {
- "request": "GET /ip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
- "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 44 61 74 65 3A 20 54 75 65 2C 20 30 31 20 4A 61 6E 20 32 30 31 39 20 31 34 3A 35 32 3A 30 32 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 33 32 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 56 69 61 3A 20 31 2E 31 20 76 65 67 75 72 0D 0A 0D 0A 7B 0A 20 20 22 6F 72 69 67 69 6E 22 3A 20 22 39 33 2E 31 37 36 2E 31 33 31 2E 33 32 22 0A 7D 0A"
+ "e9d0e7557a215fc11bb4d9fc08bdddf6": {
+ "request": "GET /ip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate, br\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
+ "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 44 61 74 65 3A 20 4D 6F 6E 2C 20 31 38 20 41 70 72 20 32 30 32 32 20 31 39 3A 32 37 3A 32 34 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 33 34 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 0D 0A 7B 0A 20 20 22 6F 72 69 67 69 6E 22 3A 20 22 31 38 35 2E 31 36 30 2E 32 30 31 2E 31 34 39 22 0A 7D 0A"
}
}
}
diff -ur mocket-3.10.4/tests/main/tests.main.test_http_with_xxhash.HttpEntryTestCase.test_truesendall_with_dump_from_recording.json mocket-3.10.4.r/tests/main/tests.main.test_http_with_xxhash.HttpEntryTestCase.test_truesendall_with_dump_from_recording.json
--- mocket-3.10.4/tests/main/tests.main.test_http_with_xxhash.HttpEntryTestCase.test_truesendall_with_dump_from_recording.json 2021-03-20 19:51:56.000000000 +0100
+++ mocket-3.10.4.r/tests/main/tests.main.test_http_with_xxhash.HttpEntryTestCase.test_truesendall_with_dump_from_recording.json 2022-04-18 21:27:26.777849529 +0200
@@ -1,13 +1,13 @@
{
"httpbin.org": {
"80": {
- "27f55d9c": {
- "request": "GET /gzip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
- "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 44 61 74 65 3A 20 54 75 65 2C 20 30 31 20 4A 61 6E 20 32 30 31 39 20 31 34 3A 35 32 3A 30 35 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 31 38 33 0D 0A 43 6F 6E 74 65 6E 74 2D 45 6E 63 6F 64 69 6E 67 3A 20 67 7A 69 70 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 56 69 61 3A 20 31 2E 31 20 76 65 67 75 72 0D 0A 0D 0A 1F 8B 08 00 95 7E 2B 5C 02 FF 4D 8F 4D 0E 82 30 10 46 F7 9C A2 E9 92 40 0D 92 68 74 47 0C EA 01 F4 00 D8 8E A5 01 3B 4D 5B 37 12 EE 6E 5B 12 74 39 EF 7B F3 37 65 84 50 F9 51 C6 80 A0 47 E2 ED 1B 0A 12 59 0F 9D 00 EB 02 9B 42 19 40 C3 39 18 1F 6A 9A 6F 72 9A A4 95 96 AD E6 28 94 96 31 8E D3 0A 22 E0 39 76 1E 56 F1 84 5A 03 F7 0A 75 74 F8 88 EE 97 5D D1 A5 C1 BD F7 E6 A1 34 43 2B D7 EC EE C0 96 8D 04 9D 8C 73 37 40 F9 87 82 33 2F F7 BE C0 F7 18 5F A0 97 F6 B6 74 53 B4 4A AA B4 EF 50 B3 6A BF 63 55 5D B1 7A 4B B3 39 FB 02 0D D4 A4 0E F8 00 00 00"
+ "1971811efc86ef5b99b1ecbeed3ed472": {
+ "request": "GET /gzip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate, br\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
+ "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 44 61 74 65 3A 20 4D 6F 6E 2C 20 31 38 20 41 70 72 20 32 30 32 32 20 31 39 3A 32 37 3A 32 36 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 32 32 34 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 43 6F 6E 74 65 6E 74 2D 45 6E 63 6F 64 69 6E 67 3A 20 67 7A 69 70 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 0D 0A 1F 8B 08 00 9E BB 5D 62 02 FF 4D 8F C1 8E C2 20 10 86 EF 7D 0A C2 D1 48 85 DA 62 BB C9 1E 7A D0 5D AF 46 93 BD 42 19 29 D9 15 1A 8A 17 8D EF 2E D4 D8 EC F1 FF E6 9F 2F 33 F7 0C 21 AC 6F 66 18 40 E1 0F 14 FC 15 96 28 B1 1E 84 02 3F 46 76 8F 31 82 B6 EB 60 08 31 E3 C5 6A 81 A7 D2 4C C9 D6 76 4E 19 AB D3 38 D9 96 48 C1 F9 4F 84 28 93 7E 2E 7F BB 71 12 F4 21 0C D2 D8 DC 79 3D CF 4E 23 78 D2 6A B0 53 63 27 7E 81 FC 43 EF D6 0F 69 2F 37 4B 8E 5E 74 40 F6 E9 62 7C 70 2E 7C 32 C2 8B 4A 49 D9 00 E1 14 8A 33 A7 75 D5 C8 62 53 51 BE 16 65 C9 40 70 1C 0D 8F D7 6F 17 08 BD 9B 96 BF B6 C7 97 1B 3B 6F B4 B1 89 B1 BA CA 19 A7 79 41 59 CE CA 06 67 8F EC 09 05 37 E5 8C 26 01 00 00"
},
- "faef8d42": {
- "request": "GET /ip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
- "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 44 61 74 65 3A 20 54 75 65 2C 20 30 31 20 4A 61 6E 20 32 30 31 39 20 31 34 3A 35 32 3A 30 34 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 33 32 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 56 69 61 3A 20 31 2E 31 20 76 65 67 75 72 0D 0A 0D 0A 7B 0A 20 20 22 6F 72 69 67 69 6E 22 3A 20 22 39 33 2E 31 37 36 2E 31 33 31 2E 33 32 22 0A 7D 0A"
+ "e9d0e7557a215fc11bb4d9fc08bdddf6": {
+ "request": "GET /ip HTTP/1.1\r\nHost: httpbin.org\r\nuser-agent: Fake-User-Agent\r\nAccept-Encoding: gzip, deflate, br\r\nAccept: */*\r\nConnection: keep-alive\r\n\r\n",
+ "response": "48 54 54 50 2F 31 2E 31 20 32 30 30 20 4F 4B 0D 0A 44 61 74 65 3A 20 4D 6F 6E 2C 20 31 38 20 41 70 72 20 32 30 32 32 20 31 39 3A 32 37 3A 32 36 20 47 4D 54 0D 0A 43 6F 6E 74 65 6E 74 2D 54 79 70 65 3A 20 61 70 70 6C 69 63 61 74 69 6F 6E 2F 6A 73 6F 6E 0D 0A 43 6F 6E 74 65 6E 74 2D 4C 65 6E 67 74 68 3A 20 33 34 0D 0A 43 6F 6E 6E 65 63 74 69 6F 6E 3A 20 6B 65 65 70 2D 61 6C 69 76 65 0D 0A 53 65 72 76 65 72 3A 20 67 75 6E 69 63 6F 72 6E 2F 31 39 2E 39 2E 30 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 4F 72 69 67 69 6E 3A 20 2A 0D 0A 41 63 63 65 73 73 2D 43 6F 6E 74 72 6F 6C 2D 41 6C 6C 6F 77 2D 43 72 65 64 65 6E 74 69 61 6C 73 3A 20 74 72 75 65 0D 0A 0D 0A 7B 0A 20 20 22 6F 72 69 67 69 6E 22 3A 20 22 31 38 35 2E 31 36 30 2E 32 30 31 2E 31 34 39 22 0A 7D 0A"
}
}
}