ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make test: reset object registry if vpp dies

Browse Source 
Change-Id: If0e30837e07a21f3912676f5147cb242d3d2b235
Signed-off-by: Klement Sekera <ksekera@cisco.com>
This commit is contained in:
Klement Sekera
2017-03-02 11:29:19 +01:00
committed by Damjan Marion
parent 80a7f0a81c
commit 1b68640930
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/vpp_object.py
View File

@ -50,6 +50,12 @@ class VppObjectRegistry(object):
else:
logger.debug("REG: duplicate add, ignoring (%s)" % obj)
def unregister_all(self, logger):
""" Remove all object registrations from registry. """
logger.debug("REG: removing all object registrations")
self._object_registry = []
self._object_dict = dict()
def remove_vpp_config(self, logger):
"""
Remove configuration (if present) from vpp and then remove all objects
@ -72,8 +78,7 @@ class VppObjectRegistry(object):
for obj in self._object_registry:
if obj.query_vpp_config():
failed.append(obj)
self._object_registry = []
self._object_dict = dict()
self.unregister_all(logger)
if failed:
logger.error("REG: Couldn't remove configuration for object(s):")
for obj in failed: