From 1a5c4314ab5394f3a5777c874c85c73c82f06854 Mon Sep 17 00:00:00 2001
From: Taybin Rutkin <taybin@users.noreply.github.com>
Date: Wed, 28 Apr 2021 10:03:58 -0400
Subject: [PATCH 1/2] fix tests directory name in Makefile (#134)

* fix tests directory name in Makefile

* fix black warning

Co-authored-by: Vikram Patki <54442035+patkivikram@users.noreply.github.com>
---
 Makefile                           | 2 +-
 tests/functional/web/test_cache.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9ecb7fb7f..0aef79033 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ DMYPY ?= dmypy
 BANDIT ?= bandit
 RENDER_CONFIGREF ?= extra/tools/render_configuration_reference.py
 CONFIGREF_TARGET ?= docs/includes/settingref.txt
-TESTDIR ?= t
+TESTDIR ?= tests
 EXAMPLESDIR ?= examples
 SPHINX_DIR ?= docs/
 SPHINX_BUILDDIR ?= "${SPHINX_DIR}/_build"
diff --git a/tests/functional/web/test_cache.py b/tests/functional/web/test_cache.py
index 9d2fb1008..1b2dedd8f 100644
--- a/tests/functional/web/test_cache.py
+++ b/tests/functional/web/test_cache.py
@@ -316,7 +316,7 @@ async def test_redis__url(
         password=password,
         db=db,
         skip_full_coverage_check=True,
-        **settings
+        **settings,
     )
 
 
@@ -432,7 +432,7 @@ async def model_response(
     *,
     expected_status: int = 200,
     expected_content_type: str = "application/json",
-    model=ResponseModel
+    model=ResponseModel,
 ):
     assert response.status == 200
     assert response.content_type == expected_content_type

From 46e961e24be5dc99925c76c485db0a1b2e210062 Mon Sep 17 00:00:00 2001
From: Taybin Rutkin <taybin@users.noreply.github.com>
Date: Wed, 28 Apr 2021 10:25:25 -0400
Subject: [PATCH 2/2] allow using 3.x of orjson.  Use orjson in tests (#135)

Co-authored-by: Vikram Patki <54442035+patkivikram@users.noreply.github.com>
---
 requirements/extras/orjson.txt | 2 +-
 requirements/test.txt          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/requirements/extras/orjson.txt b/requirements/extras/orjson.txt
index f3db328e5..fe2f14067 100644
--- a/requirements/extras/orjson.txt
+++ b/requirements/extras/orjson.txt
@@ -1 +1 @@
-orjson>=2.0,<3.0
+orjson>=2.0,<4.0
diff --git a/requirements/test.txt b/requirements/test.txt
index 4b1791940..8024fb6f9 100644
--- a/requirements/test.txt
+++ b/requirements/test.txt
@@ -24,4 +24,5 @@ wheel
 -r extras/redis.txt
 -r extras/statsd.txt
 -r extras/yaml.txt
--r extras/prometheus.txt
\ No newline at end of file
+-r extras/prometheus.txt
+-r extras/orjson.txt