summaryrefslogtreecommitdiff
path: root/jsonschema/tests
diff options
context:
space:
mode:
authorJulian Berman <Julian@GrayVines.com>2020-10-15 10:04:18 -0400
committerJulian Berman <Julian@GrayVines.com>2020-10-15 10:04:18 -0400
commitffcbebd48424e275e77ed45651262c5ac53fd444 (patch)
treeb16c22ad756908ef0762ea974128de59a94339bf /jsonschema/tests
parent1bfbb9064c0c2da5df5ea0f7ed03623f8418f278 (diff)
parente48d56cbd2b6c25d4a9483f53f79ec537b9a4a34 (diff)
downloadjsonschema-ffcbebd48424e275e77ed45651262c5ac53fd444.tar.gz
Merge remote-tracking branch 'origin/master' into fix_issue669
* origin/master: Handle multipleOf overflow Don't fail when codecov.io flakes. pep517.build is dead or dying. Temporarily skip the failing tests for #743. Sigh, ugly, but assrtRegexpMatches is deprecated. Squashed 'json/' changes from 21555a85..96742ba3 Squashed 'json/' changes from fce9e9b3..21555a85 Whoops, send coverage to codecov again. Be able to run coverage on all toxenvs. Remove outdated release notes. Use the longer form of the CLI option for clarity. Bump doc requirements (via pip-compile) Remove the Py2 coding declaration. Run pre-commit in CI. Remove docformatter, it's too unwieldy. Minor doc formatting. Sigh, this appears to be a regex, not exact match, so it was ignoring everything. Update pre-commit hooks.
Diffstat (limited to 'jsonschema/tests')
-rw-r--r--jsonschema/tests/test_types.py8
-rw-r--r--jsonschema/tests/test_validators.py4
2 files changed, 7 insertions, 5 deletions
diff --git a/jsonschema/tests/test_types.py b/jsonschema/tests/test_types.py
index 2280cc3..82071ca 100644
--- a/jsonschema/tests/test_types.py
+++ b/jsonschema/tests/test_types.py
@@ -1,7 +1,9 @@
"""
-Tests on the new type interface. The actual correctness of the type checking
-is handled in test_jsonschema_test_suite; these tests check that TypeChecker
-functions correctly and can facilitate extensions to type checking
+Tests for the `TypeChecker`-based type interface.
+
+The actual correctness of the type checking is handled in
+`test_jsonschema_test_suite`; these tests check that TypeChecker
+functions correctly at a more granular level.
"""
from collections import namedtuple
from unittest import TestCase
diff --git a/jsonschema/tests/test_validators.py b/jsonschema/tests/test_validators.py
index fc6a355..2f017b9 100644
--- a/jsonschema/tests/test_validators.py
+++ b/jsonschema/tests/test_validators.py
@@ -1561,7 +1561,7 @@ class TestValidate(SynchronousTestCase):
def test_validation_error_message(self):
with self.assertRaises(exceptions.ValidationError) as e:
validators.validate(12, {"type": "string"})
- self.assertRegexpMatches(
+ self.assertRegex(
str(e.exception),
"(?s)Failed validating u?'.*' in schema.*On instance",
)
@@ -1569,7 +1569,7 @@ class TestValidate(SynchronousTestCase):
def test_schema_error_message(self):
with self.assertRaises(exceptions.SchemaError) as e:
validators.validate(12, {"type": 12})
- self.assertRegexpMatches(
+ self.assertRegex(
str(e.exception),
"(?s)Failed validating u?'.*' in metaschema.*On schema",
)