From 3d69d5e56f2f02df02ee0f394f2d22b164b524b6 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Fri, 30 Nov 2018 14:04:03 +0100
Subject: [PATCH] put mocking in a fixture
---
test/test_data_routes.py | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/test/test_data_routes.py b/test/test_data_routes.py
index 03642b09..e7ffe89f 100644
--- a/test/test_data_routes.py
+++ b/test/test_data_routes.py
@@ -192,8 +192,18 @@ class MockedRedis(object):
def keys(self, *args, **kwargs):
return list([k.encode("utf-8") for k in MockedRedis.db.keys()])
+@pytest.fixture
+def client_with_mocked_data(mocker, client):
+ mocker.patch(
+ 'inventory_provider.router_details.redis.StrictRedis',
+ MockedRedis)
+ mocker.patch(
+ 'inventory_provider.routes.data.redis.StrictRedis',
+ MockedRedis)
+ return client
+
-def test_routers_list(mocker, client):
+def test_routers_list(client_with_mocked_data):
routers_list_schema = {
"$schema": "http://json-schema.org/draft-07/schema#",
@@ -201,13 +211,7 @@ def test_routers_list(mocker, client):
"items": {"type": "string"}
}
- mocker.patch(
- 'inventory_provider.router_details.redis.StrictRedis',
- MockedRedis)
- mocker.patch(
- 'inventory_provider.routes.data.redis.StrictRedis',
- MockedRedis)
- rv = client.post(
+ rv = client_with_mocked_data.post(
"data/routers",
headers=DEFAULT_REQUEST_HEADERS)
assert rv.status_code == 200
--
GitLab