pep8

test/per_router/test_celery_worker.py

@@ -3,39 +3,19 @@ just checks that the worker methods call the right functions
 and some data ends up in the right place ... otherwise not very detailed
 """
 import json
-import os
-import re
 
 from lxml import etree
 import pytest
 from inventory_provider.tasks import worker
 from inventory_provider.tasks.common import get_redis
 
-# class MockedRedis(object):
-#
-#     db = {}
-#
-#     def __init__(self, *args, **kwargs):
-#         pass
-#
-#     def set(self, name, value):
-#         assert isinstance(value, str)
-#         if name.startswith('netconf:'):
-#             etree.fromstring(value)
-#         elif name.startswith('snmp-interfaces:'):
-#             obj = json.loads(value)
-#             assert isinstance(obj, list)
-#         MockedRedis.db[name] = value
-#
-#     def get(self, key):
-#         return MockedRedis.db[key].encode('utf-8')
-
 
 def backend_db():
     return get_redis({
         'redis': {'hostname': None, 'port': None}
     }).db
 
+
 @pytest.fixture
 def mocked_worker_module(
         mocker, mocked_redis, data_config,

test/per_router/test_data_routes.py

 import json
-import os
-import re
-
 import pytest
 import jsonschema
 
-import inventory_provider
-
-# TEST_DATA_DIRNAME = os.path.realpath(os.path.join(
-#     inventory_provider.__path__[0],
-#     "..",
-#     "test",
-#     "data"))
-#
 DEFAULT_REQUEST_HEADERS = {
     "Content-type": "application/json",
     "Accept": ["application/json"]
 }
 
 
-# class MockedRedis(object):
-#
-#     db = None
-#
-#     def __init__(self, *args, **kwargs):
-#         if MockedRedis.db is None:
-#             test_data_filename = os.path.join(
-#                 TEST_DATA_DIRNAME,
-#                 "router-info.json")
-#             with open(test_data_filename) as f:
-#                 MockedRedis.db = json.loads(f.read())
-#
-#     def set(self, key, value):
-#         MockedRedis.db[key] = value
-#
-#     def get(self, key):
-#         return MockedRedis.db[key].encode('utf-8')
-#
-#     # def hget(self, key, field):
-#     #     value = MockedRedis.db[key]
-#     #     return value[field].encode('utf-8')
-#     #     # return json.dumps(value[field]).encode('utf-8')
-#     #
-#     # def hgetall(self, key):
-#     #     result = {}
-#     #     for k, v in MockedRedis.db[key].items():
-#     #         result[k.encode('utf-8')] \
-#     #             = json.dumps(v).encode('utf-8')
-#     #     return result
-#     #
-#     # def keys(self, *args, **kwargs):
-#     #     return list([k.encode("utf-8") for k in MockedRedis.db.keys()])
-#
-#     def keys(self, glob=None):
-#         if not glob:
-#             return list([k.encode("utf-8") for k in MockedRedis.db.keys()])
-#         m = re.match(r'^([^*]+)\*$', glob)
-#         assert m  # all expected global are like this
-#         return list([
-#             k.encode("utf-8") for k in MockedRedis.db.keys()
-#             if k.startswith(m.group(1))])
-
-
-# @pytest.fixture
-# def client_with_mocked_data(mocker, client):
-#     mocker.patch(
-#         'inventory_provider.routes.common.redis.StrictRedis',
-#         MockedRedis)
-#     return client
-#
-
 def test_router_interfaces(router, client_with_mocked_data):
 
     interfaces_list_schema = {

test/per_router/test_poller_routes.py

 import json
-import os
-
-import pytest
 import jsonschema
 
-import inventory_provider
-
-# TEST_DATA_DIRNAME = os.path.realpath(os.path.join(
-#     inventory_provider.__path__[0],
-#     "..",
-#     "test",
-#     "data"))
-#
 DEFAULT_REQUEST_HEADERS = {
     "Content-type": "application/json",
     "Accept": ["application/json"]
 }
 
 
-# class MockedRedis(object):
-#
-#     db = None
-#
-#     def __init__(self, *args, **kwargs):
-#         if MockedRedis.db is None:
-#             test_data_filename = os.path.join(
-#                 TEST_DATA_DIRNAME,
-#                 "router-info.json")
-#             with open(test_data_filename) as f:
-#                 MockedRedis.db = json.loads(f.read())
-#
-#     def set(self, key, value):
-#         MockedRedis.db[key] = value
-#
-#     def get(self, key):
-#         value = MockedRedis.db.get(key)
-#         if value is None:
-#             return None
-#         return value.encode('utf-8')
-#
-#     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.routes.common.redis.StrictRedis',
-#         MockedRedis)
-#     return client
-#
-
 def test_router_interfaces(router, client_with_mocked_data):
 
     interfaces_list_schema = {