From 8478646ffaaee48ec06fe174b4946cafa0aef7cd Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Sun, 3 Feb 2019 20:53:37 +0100
Subject: [PATCH] use cache data for classifer test
---
test/test_classifier_routes.py | 49 +++-------------------------------
1 file changed, 4 insertions(+), 45 deletions(-)
diff --git a/test/test_classifier_routes.py b/test/test_classifier_routes.py
index 39c263cc..27dd9b59 100644
--- a/test/test_classifier_routes.py
+++ b/test/test_classifier_routes.py
@@ -41,24 +41,6 @@ def test_coriant_addresses(client):
def test_juniper_addresses(mocker, client):
- test_data = [
- {"ip_address": "a.b.c.d", "project_name": "AAABBB"},
- {"ip_address": "b.c.d.e", "project_name": "CCCCDDDDD"},
- {"ip_address": "c.d.e.f", "project_name": "EFEFEFEF"},
- {"ip_address": "::1", "project_name": "GGHHGGHH"}
- ]
-
- class MockedRedis():
- def __init__(self, *args, **kwargs):
- pass
-
- def get(self, ignored):
- return json.dumps(test_data).encode('utf-8')
-
- mocker.patch(
- 'inventory_provider.routes.common.redis.StrictRedis',
- MockedRedis)
-
response_schema = {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "array",
@@ -71,39 +53,16 @@ def test_juniper_addresses(mocker, client):
assert rv.status_code == 200
response_data = json.loads(rv.data.decode('utf-8'))
jsonschema.validate(response_data, response_schema)
- assert len(response_data) == len(test_data)
- assert set([x['ip_address'] for x in test_data]) == set(response_data)
+ assert len(response_data) > 0 # test data is not empty
-def test_trap_metadata(mocker, client):
- test_data = [
- {
- "equipment": "test-equipment",
- "manufacturer": "test-manufacturer",
- "vendor": "test-vendor",
- "absid": "1234",
- "name": "test-service_1"
- },
- {
- "equipment": "test-equipment",
- "manufacturer": "test-manufacturer",
- "vendor": "test-vendor",
- "absid": "2345",
- "name": "test-service_2"
- }
- ]
- mocked_redis = mocker.patch(
- "inventory_provider.routes.common.get_redis")
- mocked_redis.return_value.hget.return_value = json.dumps(test_data)\
- .encode("utf-8")
-
+def test_trap_metadata(client_with_mocked_data):
response_schema = {
"$schema": "http://json-schema.org/draft-07/schema#",
"type": "object"
}
-
- rv = client.get(
- '/classifier/trap-metadata/BGP/dummy-equipment/xe-2/3/1',
+ rv = client_with_mocked_data.get(
+ '/classifier/trap-metadata/BGP/mx1.ams.nl.geant.net/ae15.1500',
headers=DEFAULT_REQUEST_HEADERS)
assert rv.status_code == 200
assert rv.is_json
--
GitLab