From f6dec32e3a2f5584a862b21f0083b886d95e8e53 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Sun, 6 Jan 2019 19:31:49 -0500 Subject: [PATCH 1/2] Update pytest from 4.0.2 to 4.1.0 --- requirements/dev.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements/dev.txt b/requirements/dev.txt index a6627d91e09..c356491462c 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,8 +1,8 @@ # Dependencies needed only for development/testing. -pytest==4.0.2 \ - --hash=sha256:f812ea39a0153566be53d88f8de94839db1e8a05352ed8a49525d7d7f37861e9 \ - --hash=sha256:f689bf2fc18c4585403348dd56f47d87780bf217c53ed9ae7a3e2d7faa45f8e9 +pytest==4.1.0 \ + --hash=sha256:3e65a22eb0d4f1bdbc1eacccf4a3198bf8d4049dea5112d70a0c61b00e748d02 \ + --hash=sha256:5924060b374f62608a078494b909d341720a050b5224ff87e17e12377486a71d django-debug-toolbar==1.11 \ --hash=sha256:c2b0134119a624f4ac9398b44f8e28a01c7686ac350a12a74793f3dd57a9eea0 \ From 90f4f593ddf8b779163fad624bda4d4b1d642c0c Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Tue, 8 Jan 2019 10:33:09 +0000 Subject: [PATCH 2/2] Use 'match' instead of 'message' with pytest.raises() Since the former is actually what we should have been using all along. See: https://github.com/pytest-dev/pytest/issues/3974 --- tests/test_setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_setup.py b/tests/test_setup.py index 8ef512968dd..15c33f338ea 100644 --- a/tests/test_setup.py +++ b/tests/test_setup.py @@ -12,7 +12,7 @@ def test_block_unmocked_requests(): """Ensure the `block_unmocked_requests` fixture prevents requests from hitting the network.""" url = 'https://example.com' - with pytest.raises(RuntimeError, message='Tests must mock all HTTP requests!'): + with pytest.raises(RuntimeError, match='Tests must mock all HTTP requests!'): fetch_text(url) with responses.RequestsMock() as rsps: