From 5a45e640b2d5ffd331a922792445d5c06fe89320 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 11:43:16 +0300 Subject: [PATCH 01/28] Add test dependency on hypothesis --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tox.ini b/tox.ini index 29c256d1..635a8508 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,7 @@ isolated_build = true [testenv] deps= pytest + hypothesis changedir=test commands= @@ -23,6 +24,7 @@ setenv= basepython=python2.7-x86 deps= pytest + hypothesis changedir=test commands= @@ -34,6 +36,7 @@ commands= basepython=python3.4-x86 deps= pytest + hypothesis changedir=test commands= From df1c2dd25116607c9cdc592b38751e13bc633537 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:10:28 +0300 Subject: [PATCH 02/28] Start testing with hypothesis --- .gitignore | 1 + test/test_property_based.py | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 test/test_property_based.py diff --git a/.gitignore b/.gitignore index 800f1c22..16a39be9 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ msgpack/*.cpp /tags /docs/_build .cache +.hypothesis diff --git a/test/test_property_based.py b/test/test_property_based.py new file mode 100644 index 00000000..0776040c --- /dev/null +++ b/test/test_property_based.py @@ -0,0 +1,24 @@ +import pytest +from hypothesis import given +from hypothesis import strategies as st + +try: + from msgpack import _cmsgpack +except ImportError: + _cmsgpack = None +from msgpack import fallback + +# https://github.com/msgpack/msgpack/blob/master/spec.md#type-system +simple_types = ( + st.none() + | st.booleans() +) + + +@pytest.mark.skipif(_cmsgpack is None, reason='C extension is not available') +@given(simple_types) +def test_extension_and_fallback_pack_identically(obj): + extension_packer = _cmsgpack.Packer() + fallback_packer = fallback.Packer() + + assert extension_packer.pack(obj) == fallback_packer.pack(obj) From 1838bf166913c7e9afabeb1f30ae44432deec145 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:24:22 +0300 Subject: [PATCH 03/28] Add integers to property based testing --- test/test_property_based.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 0776040c..d9d22e47 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -10,7 +10,8 @@ # https://github.com/msgpack/msgpack/blob/master/spec.md#type-system simple_types = ( - st.none() + st.integers(min_value=-(2**63), max_value=(2**64)-1) + | st.none() | st.booleans() ) From cbfe680ddc10b2e72bb3764e0959c43739ec4c89 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:25:20 +0300 Subject: [PATCH 04/28] Add floats to property based testing --- test/test_property_based.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_property_based.py b/test/test_property_based.py index d9d22e47..feaf24ac 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -13,6 +13,7 @@ st.integers(min_value=-(2**63), max_value=(2**64)-1) | st.none() | st.booleans() + | st.floats() ) From 521dc9b34225633f1fa4fd686c2b3b2db230d4c1 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:28:23 +0300 Subject: [PATCH 05/28] Add str to property based testing --- test/test_property_based.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_property_based.py b/test/test_property_based.py index feaf24ac..4e2b9d59 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -14,6 +14,7 @@ | st.none() | st.booleans() | st.floats() + | st.text() ) From a681f7f3f0f4b34a9d330c3c270af14d36ba1e25 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:30:06 +0300 Subject: [PATCH 06/28] Add bytes to property based testing --- test/test_property_based.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_property_based.py b/test/test_property_based.py index 4e2b9d59..07012226 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -15,6 +15,7 @@ | st.booleans() | st.floats() | st.text() + | st.binary() ) From c44d4c39c18b6400c973e3cbf40596824101b84e Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:31:26 +0300 Subject: [PATCH 07/28] Add TODO --- test/test_property_based.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/test_property_based.py b/test/test_property_based.py index 07012226..1e09a78e 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -9,6 +9,8 @@ from msgpack import fallback # https://github.com/msgpack/msgpack/blob/master/spec.md#type-system +# TODO: test timestamps +# TODO: test the extension type simple_types = ( st.integers(min_value=-(2**63), max_value=(2**64)-1) | st.none() From c68f247188ad65001e644d4f55c4a1cd0822ffb0 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:36:18 +0300 Subject: [PATCH 08/28] Add list to to property based testing --- test/test_property_based.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 1e09a78e..9df276fb 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -19,10 +19,13 @@ | st.text() | st.binary() ) +def composite_types(any_type): + return st.lists(any_type) +any_type = st.recursive(simple_types, composite_types) @pytest.mark.skipif(_cmsgpack is None, reason='C extension is not available') -@given(simple_types) +@given(any_type) def test_extension_and_fallback_pack_identically(obj): extension_packer = _cmsgpack.Packer() fallback_packer = fallback.Packer() From 7d52fcf2a73646fa22c2b2e43af56ceed59ec798 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:38:39 +0300 Subject: [PATCH 09/28] Add dict to property based testing --- test/test_property_based.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 9df276fb..8374a68e 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -20,7 +20,7 @@ | st.binary() ) def composite_types(any_type): - return st.lists(any_type) + return st.lists(any_type) | st.dictionaries(st.text(), any_type) any_type = st.recursive(simple_types, composite_types) From f36b286660b9a2845ac0beea90d45679a4a653a5 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:43:29 +0300 Subject: [PATCH 10/28] Test all non-composite types as map keys --- test/test_property_based.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 8374a68e..2dfc354e 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -20,8 +20,7 @@ | st.binary() ) def composite_types(any_type): - return st.lists(any_type) | st.dictionaries(st.text(), any_type) - + return st.lists(any_type) | st.dictionaries(simple_types, any_type) any_type = st.recursive(simple_types, composite_types) @pytest.mark.skipif(_cmsgpack is None, reason='C extension is not available') From af9deb5c3c31c3e6e87ce444b8e066e8faab308d Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:44:13 +0300 Subject: [PATCH 11/28] Fix style --- test/test_property_based.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 2dfc354e..02395d77 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -12,7 +12,7 @@ # TODO: test timestamps # TODO: test the extension type simple_types = ( - st.integers(min_value=-(2**63), max_value=(2**64)-1) + st.integers(min_value=-(2**63), max_value=2**64 - 1) | st.none() | st.booleans() | st.floats() From fccea37a2eae86984644ea95ed5251b6155995aa Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:50:06 +0300 Subject: [PATCH 12/28] Add max_size --- test/test_property_based.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 02395d77..5be06ffa 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -16,11 +16,17 @@ | st.none() | st.booleans() | st.floats() + # TODO: maximum byte size of a String object is (2^32)-1 + # the problem is that hypothesis only allows control over the max character count + # TODO: String objects may contain invalid byte sequence | st.text() - | st.binary() + | st.binary(max_size=2**32 - 1) ) def composite_types(any_type): - return st.lists(any_type) | st.dictionaries(simple_types, any_type) + return ( + st.lists(any_type, max_size=2**32 - 1) + | st.dictionaries(simple_types, any_type, max_size=2**32 - 1) + ) any_type = st.recursive(simple_types, composite_types) @pytest.mark.skipif(_cmsgpack is None, reason='C extension is not available') From f05ec6e04961ed490091bcae19e0915aec127a35 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 12:52:49 +0300 Subject: [PATCH 13/28] Fix style --- test/test_property_based.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_property_based.py b/test/test_property_based.py index 5be06ffa..e27b0b37 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -29,6 +29,7 @@ def composite_types(any_type): ) any_type = st.recursive(simple_types, composite_types) + @pytest.mark.skipif(_cmsgpack is None, reason='C extension is not available') @given(any_type) def test_extension_and_fallback_pack_identically(obj): From f9d7cadc34263a20c9743b79e4b577b2162a67c4 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 13:15:27 +0300 Subject: [PATCH 14/28] Fix error: Data generation is extremely slow Error: E hypothesis.errors.FailedHealthCheck: Data generation is extremely slow: Only produced 9 valid examples in 1.16 seconds (0 invalid ones and 0 exceeded maximum size). Try decreasing size of the data you're generating (with e.g.max_size or max_leaves parameters). --- test/test_property_based.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index e27b0b37..54cfbced 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -8,6 +8,8 @@ _cmsgpack = None from msgpack import fallback +HYPOTHESIS_MAX = 2**10 + # https://github.com/msgpack/msgpack/blob/master/spec.md#type-system # TODO: test timestamps # TODO: test the extension type @@ -20,12 +22,12 @@ # the problem is that hypothesis only allows control over the max character count # TODO: String objects may contain invalid byte sequence | st.text() - | st.binary(max_size=2**32 - 1) + | st.binary(max_size=HYPOTHESIS_MAX) ) def composite_types(any_type): return ( - st.lists(any_type, max_size=2**32 - 1) - | st.dictionaries(simple_types, any_type, max_size=2**32 - 1) + st.lists(any_type, max_size=HYPOTHESIS_MAX) + | st.dictionaries(simple_types, any_type, max_size=HYPOTHESIS_MAX) ) any_type = st.recursive(simple_types, composite_types) From c427cc105102d1a49484ca6f2a9dd9de8fa6bca8 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 13:38:12 +0300 Subject: [PATCH 15/28] Add test_roudtrip --- test/test_property_based.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/test_property_based.py b/test/test_property_based.py index 54cfbced..ee98d4d0 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -39,3 +39,16 @@ def test_extension_and_fallback_pack_identically(obj): fallback_packer = fallback.Packer() assert extension_packer.pack(obj) == fallback_packer.pack(obj) + + +@pytest.mark.parametrize('impl', [fallback, _cmsgpack]) +@given(obj=any_type) +def test_roudtrip(obj, impl): + if impl is None: + pytest.skip('C extension is not available') + packer = impl.Packer() + unpacker = impl.Unpacker(strict_map_key=False) + unpacker.feed(packer.pack(obj)) + got = list(unpacker) + # using [obj] == got fails because NaN != NaN + assert repr([obj]) == repr(got) From c6c267015d15a5b9951df7a0b57415a6d7e1c2b1 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 13:42:03 +0300 Subject: [PATCH 16/28] This is now obsolete --- test/test_property_based.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index ee98d4d0..13241c5f 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -18,10 +18,8 @@ | st.none() | st.booleans() | st.floats() - # TODO: maximum byte size of a String object is (2^32)-1 - # the problem is that hypothesis only allows control over the max character count # TODO: String objects may contain invalid byte sequence - | st.text() + | st.text(max_size=HYPOTHESIS_MAX) | st.binary(max_size=HYPOTHESIS_MAX) ) def composite_types(any_type): From fe501231c2d17f41f20a5b29689a301a20bf9d02 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 13:42:32 +0300 Subject: [PATCH 17/28] Clarify comment --- test/test_property_based.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 13241c5f..f09eef16 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -18,7 +18,7 @@ | st.none() | st.booleans() | st.floats() - # TODO: String objects may contain invalid byte sequence + # TODO: The msgpack speck says that string objects may contain invalid byte sequence | st.text(max_size=HYPOTHESIS_MAX) | st.binary(max_size=HYPOTHESIS_MAX) ) From 3997376ce650e46dfd79e3857b597edaba840cb7 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Wed, 24 Feb 2021 13:49:21 +0300 Subject: [PATCH 18/28] Add TODO --- test/test_property_based.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_property_based.py b/test/test_property_based.py index f09eef16..2110b762 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -39,6 +39,7 @@ def test_extension_and_fallback_pack_identically(obj): assert extension_packer.pack(obj) == fallback_packer.pack(obj) +# TODO: also test with strict_map_key=True @pytest.mark.parametrize('impl', [fallback, _cmsgpack]) @given(obj=any_type) def test_roudtrip(obj, impl): From 151e8add0319966ca012061d70b4a35733313caf Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 10:57:03 +0300 Subject: [PATCH 19/28] Fix: Data generation is extremely slow E hypothesis.errors.FailedHealthCheck: Data generation is extremely slow: Only produced 7 valid examples in 1.01 seconds (0 invalid ones and 1 exceeded maximum size). Try decreasing size of the data you're generating (with e.g.max_size or max_leaves parameters). E See https://hypothesis.readthedocs.io/en/latest/healthchecks.html for more information about this. If you want to disable just this health check, add HealthCheck.too_slow to the suppress_health_check settings for this test. --- test/test_property_based.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 2110b762..c55f6401 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -8,7 +8,7 @@ _cmsgpack = None from msgpack import fallback -HYPOTHESIS_MAX = 2**10 +HYPOTHESIS_MAX = 50 # https://github.com/msgpack/msgpack/blob/master/spec.md#type-system # TODO: test timestamps From d2ee79fdf4d8c10ecaf5253b726a45abd17f30bd Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 10:57:42 +0300 Subject: [PATCH 20/28] Add test_extension_and_fallback_unpack_identically --- test/test_property_based.py | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index c55f6401..24637b14 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -1,6 +1,5 @@ import pytest -from hypothesis import given -from hypothesis import strategies as st +from hypothesis import given, assume, strategies as st try: from msgpack import _cmsgpack @@ -51,3 +50,32 @@ def test_roudtrip(obj, impl): got = list(unpacker) # using [obj] == got fails because NaN != NaN assert repr([obj]) == repr(got) + + +# TODO: also test with strict_map_key=True +@pytest.mark.skipif(_cmsgpack is None, reason='C extension is not available') +@given(st.binary(max_size=HYPOTHESIS_MAX)) +def test_extension_and_fallback_unpack_identically(buf): + extension_packer = _cmsgpack.Unpacker(strict_map_key=False) + fallback_packer = fallback.Unpacker(strict_map_key=False) + try: + extension_packer.feed(buf) + from_extension = list(extension_packer) + except Exception as e: + # There are currently some cacese where the exception message from fallback and extension is different + # Until this is fixed we can only compare types + from_extension = type(e) + try: + fallback_packer.feed(buf) + from_fallback = list(fallback_packer) + except ValueError as e: + print(e) + # There is a known discrepancy between the extension and the fallback unpackers + # See https://github.com/msgpack/msgpack-python/pull/464 + assume(False) + except Exception as e: + from_fallback = type(e) + # using from_extension == from_fallback fails because: + # NaN != NaN + # Exception('foo') != Exception('foo') + assert repr(from_extension) == repr(from_fallback) From 59596d26bc99a287e1b5319eb94c88b46a79fe32 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 10:59:19 +0300 Subject: [PATCH 21/28] Blacken test/test_property_based.py --- test/test_property_based.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 24637b14..b4007392 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -13,7 +13,7 @@ # TODO: test timestamps # TODO: test the extension type simple_types = ( - st.integers(min_value=-(2**63), max_value=2**64 - 1) + st.integers(min_value=-(2 ** 63), max_value=2 ** 64 - 1) | st.none() | st.booleans() | st.floats() @@ -21,15 +21,18 @@ | st.text(max_size=HYPOTHESIS_MAX) | st.binary(max_size=HYPOTHESIS_MAX) ) + + def composite_types(any_type): - return ( - st.lists(any_type, max_size=HYPOTHESIS_MAX) - | st.dictionaries(simple_types, any_type, max_size=HYPOTHESIS_MAX) + return st.lists(any_type, max_size=HYPOTHESIS_MAX) | st.dictionaries( + simple_types, any_type, max_size=HYPOTHESIS_MAX ) + + any_type = st.recursive(simple_types, composite_types) -@pytest.mark.skipif(_cmsgpack is None, reason='C extension is not available') +@pytest.mark.skipif(_cmsgpack is None, reason="C extension is not available") @given(any_type) def test_extension_and_fallback_pack_identically(obj): extension_packer = _cmsgpack.Packer() @@ -39,11 +42,11 @@ def test_extension_and_fallback_pack_identically(obj): # TODO: also test with strict_map_key=True -@pytest.mark.parametrize('impl', [fallback, _cmsgpack]) +@pytest.mark.parametrize("impl", [fallback, _cmsgpack]) @given(obj=any_type) def test_roudtrip(obj, impl): if impl is None: - pytest.skip('C extension is not available') + pytest.skip("C extension is not available") packer = impl.Packer() unpacker = impl.Unpacker(strict_map_key=False) unpacker.feed(packer.pack(obj)) @@ -53,7 +56,7 @@ def test_roudtrip(obj, impl): # TODO: also test with strict_map_key=True -@pytest.mark.skipif(_cmsgpack is None, reason='C extension is not available') +@pytest.mark.skipif(_cmsgpack is None, reason="C extension is not available") @given(st.binary(max_size=HYPOTHESIS_MAX)) def test_extension_and_fallback_unpack_identically(buf): extension_packer = _cmsgpack.Unpacker(strict_map_key=False) From b6a4bfcc361fe10e38976497f48d5624ea81a6c1 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 11:10:01 +0300 Subject: [PATCH 22/28] Use unpackb instead of unpacker --- test/test_property_based.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index b4007392..c10444a8 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -48,11 +48,10 @@ def test_roudtrip(obj, impl): if impl is None: pytest.skip("C extension is not available") packer = impl.Packer() - unpacker = impl.Unpacker(strict_map_key=False) - unpacker.feed(packer.pack(obj)) - got = list(unpacker) - # using [obj] == got fails because NaN != NaN - assert repr([obj]) == repr(got) + buf = packer.pack(obj) + got = impl.unpackb(buf, strict_map_key=False) + # using obj == got fails because NaN != NaN + assert repr(obj) == repr(got) # TODO: also test with strict_map_key=True From 681f79f6127c1242847be30eb22b66215d49edaa Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 11:27:09 +0300 Subject: [PATCH 23/28] Use unpackb instead of Unpacker --- test/test_property_based.py | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index c10444a8..43168bd4 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -1,6 +1,8 @@ import pytest from hypothesis import given, assume, strategies as st +import msgpack + try: from msgpack import _cmsgpack except ImportError: @@ -58,26 +60,25 @@ def test_roudtrip(obj, impl): @pytest.mark.skipif(_cmsgpack is None, reason="C extension is not available") @given(st.binary(max_size=HYPOTHESIS_MAX)) def test_extension_and_fallback_unpack_identically(buf): - extension_packer = _cmsgpack.Unpacker(strict_map_key=False) - fallback_packer = fallback.Unpacker(strict_map_key=False) - try: - extension_packer.feed(buf) - from_extension = list(extension_packer) - except Exception as e: - # There are currently some cacese where the exception message from fallback and extension is different - # Until this is fixed we can only compare types - from_extension = type(e) try: - fallback_packer.feed(buf) - from_fallback = list(fallback_packer) - except ValueError as e: - print(e) - # There is a known discrepancy between the extension and the fallback unpackers + from_extension = _cmsgpack.unpackb(buf) + except (msgpack.ExtraData, ValueError) as e: + # Ignore the exception message. This avoids: + # + # Falsifying example: buf=b'\x00\x00' + # Error: ExtraData(0, bytearray(b'\x00')) != ExtraData(0, b'\x00') + # + # Falsifying example: buf=b'\xa2' + # Error: ValueError('2 exceeds max_str_len(1)') != ValueError('Unpack failed: incomplete input') # See https://github.com/msgpack/msgpack-python/pull/464 - assume(False) + from_extension = type(e) except Exception as e: + from_extension = e + try: + from_fallback = fallback.unpackb(buf) + except (msgpack.ExtraData, ValueError) as e: from_fallback = type(e) - # using from_extension == from_fallback fails because: - # NaN != NaN - # Exception('foo') != Exception('foo') + except Exception as e: + from_fallback = e + assert repr(from_extension) == repr(from_fallback) From fd28b0c04fd0364ca32e059e5e2ab779a9587697 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 12:02:13 +0300 Subject: [PATCH 24/28] Add test dependency: hypothesis --- .github/workflows/linux.yml | 8 ++++---- .github/workflows/mac.yml | 8 ++++---- ci/runtests.bat | 2 +- ci/runtests.sh | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f9707b1c..50a5cc4d 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -42,7 +42,7 @@ jobs: - name: Run test (3.8) run: | - pip install pytest + pip install pytest hypothesis pip install -v msgpack --only-binary :all: --no-index -f dist/wheelhouse pytest -v test @@ -54,7 +54,7 @@ jobs: - name: Run test (3.9) run: | - pip install pytest + pip install pytest hypothesis pip install -v msgpack --only-binary :all: --no-index -f dist/wheelhouse pytest -v test @@ -65,7 +65,7 @@ jobs: - name: Run test (3.7) run: | - pip install pytest + pip install pytest hypothesis pip install -v msgpack --only-binary :all: --no-index -f dist/wheelhouse pytest -v test @@ -76,7 +76,7 @@ jobs: - name: Run test (3.6) run: | - pip install pytest + pip install pytest hypothesis pip install -v msgpack --only-binary :all: --no-index -f dist/wheelhouse pytest -v test diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 78d944cc..568de12c 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -30,7 +30,7 @@ jobs: - name: Run test run: | - pip install pytest + pip install pytest hypothesis pip install -v msgpack --only-binary :all: -f dist/ --no-index pytest -v test @@ -47,7 +47,7 @@ jobs: - name: Run test run: | - pip install pytest + pip install pytest hypothesis pip install -v msgpack --only-binary :all: -f dist/ --no-index pytest -v test @@ -64,7 +64,7 @@ jobs: - name: Run test run: | - pip install pytest + pip install pytest hypothesis pip install -v msgpack --only-binary :all: -f dist/ --no-index pytest -v test @@ -81,7 +81,7 @@ jobs: - name: Run test run: | - pip install pytest + pip install pytest hypothesis pip install -v msgpack --only-binary :all: -f dist/ --no-index pytest -v test diff --git a/ci/runtests.bat b/ci/runtests.bat index 4ae2f708..41dbe9ac 100644 --- a/ci/runtests.bat +++ b/ci/runtests.bat @@ -1,4 +1,4 @@ -%PYTHON%\python.exe -m pip install -U pip wheel pytest +%PYTHON%\python.exe -m pip install -U pip wheel pytest hypothesis %PYTHON%\python.exe setup.py build_ext -i %PYTHON%\python.exe setup.py install %PYTHON%\python.exe -c "import sys; print(hex(sys.maxsize))" diff --git a/ci/runtests.sh b/ci/runtests.sh index 5d87f696..45a2dc5f 100644 --- a/ci/runtests.sh +++ b/ci/runtests.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ex ${PYTHON} -VV -${PYTHON} -m pip install setuptools wheel pytest +${PYTHON} -m pip install setuptools wheel pytest hypothesis ${PYTHON} setup.py build_ext -if ${PYTHON} -c "from msgpack import _cmsgpack" ${PYTHON} setup.py bdist_wheel From 4e66cf1d2408c7a0b75dc698bb0e853a4787561d Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 12:18:51 +0300 Subject: [PATCH 25/28] Add test dependency: hypothesis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4974d26c..6efebdc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ python: _pure: &pure install: - pip install -U pip - - pip install -U pytest pytest-cov codecov + - pip install -U pytest pytest-cov codecov hypothesis - pip install . script: - pytest --cov=msgpack -v test @@ -70,7 +70,7 @@ matrix: install: - pip install -U pip - - pip install -U pytest pytest-cov codecov + - pip install -U pytest pytest-cov codecov hypothesis - pip install -r requirements.txt # Cython - make cython - pip install -e . From 6f15eda54d9716b51cae9011f40d6e46560c1701 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 12:29:01 +0300 Subject: [PATCH 26/28] Fix: Data generation is extremely slow E hypothesis.errors.FailedHealthCheck: Data generation is extremely slow: Only produced 7 valid examples in 1.01 seconds (0 invalid ones and 1 exceeded maximum size). Try decreasing size of the data you're generating (with e.g.max_size or max_leaves parameters). E See https://hypothesis.readthedocs.io/en/latest/healthchecks.html for more information about this. If you want to disable just this health check, add HealthCheck.too_slow to the suppress_health_check settings for this test. --- test/test_property_based.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_property_based.py b/test/test_property_based.py index 43168bd4..7603b44f 100644 --- a/test/test_property_based.py +++ b/test/test_property_based.py @@ -9,7 +9,7 @@ _cmsgpack = None from msgpack import fallback -HYPOTHESIS_MAX = 50 +HYPOTHESIS_MAX = 3 # https://github.com/msgpack/msgpack/blob/master/spec.md#type-system # TODO: test timestamps From aad7b96a73352630f5d1be1101fe989de635cb4c Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 12:48:05 +0300 Subject: [PATCH 27/28] Add test dependency: hypothesis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6efebdc8..ed3d8ddd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,6 +33,7 @@ matrix: - DOCKER_IMAGE=quay.io/pypa/manylinux1_i686 install: - pip install -U pip + - pip install -U hypothesis - pip install -r requirements.txt - make cython - docker pull $DOCKER_IMAGE @@ -48,6 +49,7 @@ matrix: - DOCKER_IMAGE=quay.io/pypa/manylinux2014_aarch64 install: - pip install -U pip + - pip install -U hypothesis - pip install -r requirements.txt - make cython - docker pull $DOCKER_IMAGE From 9622b83fdeb8891ebf25441665de09e0144d8b55 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Mon, 1 Mar 2021 13:10:08 +0300 Subject: [PATCH 28/28] Add test dependency: hypothesis --- docker/runtests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/runtests.sh b/docker/runtests.sh index fa7e979b..a16a0fae 100755 --- a/docker/runtests.sh +++ b/docker/runtests.sh @@ -8,7 +8,7 @@ for V in "${PYTHON_VERSIONS[@]}"; do PYBIN=/opt/python/$V/bin $PYBIN/python setup.py install rm -rf build/ # Avoid lib build by narrow Python is used by wide python - $PYBIN/pip install pytest + $PYBIN/pip install pytest hypothesis pushd test # prevent importing msgpack package in current directory. $PYBIN/python -c 'import sys; print(hex(sys.maxsize))' $PYBIN/python -c 'from msgpack import _cmsgpack' # Ensure extension is available