Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust expected exceptions in option merging tests for PyPy3 #763

Merged
merged 3 commits into from May 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/main.yml
Expand Up @@ -18,7 +18,8 @@ jobs:
strategy:
matrix:
platform: ["ubuntu-latest", "windows-latest"]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10",
"3.11.0-beta - 3.11", "pypy-3.8", "pypy-3.9"]

steps:
- uses: "actions/checkout@v3"
Expand Down
4 changes: 2 additions & 2 deletions tests/test_api_jws.py
Expand Up @@ -83,7 +83,7 @@ def test_non_object_options_dont_persist(self, jws, payload):

def test_options_must_be_dict(self, jws):
pytest.raises(TypeError, PyJWS, options=object())
pytest.raises(TypeError, PyJWS, options=("something"))
pytest.raises((TypeError, ValueError), PyJWS, options=("something"))

def test_encode_decode(self, jws, payload):
secret = "secret"
Expand Down Expand Up @@ -607,7 +607,7 @@ def test_decode_options_must_be_dict(self, jws, payload):
with pytest.raises(TypeError):
jws.decode(token, "secret", options=object())

with pytest.raises(TypeError):
with pytest.raises((TypeError, ValueError)):
jws.decode(token, "secret", options="something")

def test_custom_json_encoder(self, jws, payload):
Expand Down
5 changes: 4 additions & 1 deletion tox.ini
Expand Up @@ -13,13 +13,16 @@ python =
3.8: py38, typing
3.9: py39
3.10: py310
3.11: py311
pypy-3.8: pypy3
pypy-3.9: pypy3


[tox]
envlist =
lint
typing
py{36,37,38,39}-{crypto,nocrypto}
py{36,37,38,39,310,311,py3}-{crypto,nocrypto}
docs
pypi-description
coverage-report
Expand Down