From 45718f04b90fa8d4a99094b17c7e05468f180dd9 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Thu, 7 Feb 2019 16:05:56 +0100
Subject: [PATCH] adapt to different MockedRedis
---
test/per_router/test_celery_worker.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/per_router/test_celery_worker.py b/test/per_router/test_celery_worker.py
index 5e42de20..f822c5e7 100644
--- a/test/per_router/test_celery_worker.py
+++ b/test/per_router/test_celery_worker.py
@@ -95,22 +95,22 @@ def mocked_worker_module(mocker, data_config, cached_test_data, mocked_netifaces
'inventory_provider.juniper.load_config',
_mocked_load_juniper_netconf_config)
+ unused = MockedRedis() # init so that db is initialized
+
def test_netconf_refresh_config(mocked_worker_module, router):
- assert 'netconf:' + router not in MockedRedis.db
+ del MockedRedis.db['netconf:' + router]
worker.netconf_refresh_config(router)
assert MockedRedis.db['netconf:' + router]
def test_snmp_refresh_interfaces(mocked_worker_module, router):
- assert 'snmp-interfaces:' + router not in MockedRedis.db
+ del MockedRedis.db['snmp-interfaces:' + router]
worker.snmp_refresh_interfaces(router, 'fake-community')
assert MockedRedis.db['snmp-interfaces:' + router]
def test_reload_router_config(mocked_worker_module, router, mocker):
- unused = MockedRedis() # init so that db is initialized
-
saved_data = {}
for key in ('netconf:' + router, 'snmp-interfaces:' + router):
saved_data[key] = MockedRedis.db.pop(key)
--
GitLab