X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_object.py;h=088cc39ce0a90742e0022c433881a01ac764b74b;hb=f051072f8518097cbce1a8a20510c4e43cb7167c;hp=a1cf42fce35385e74cb8a028ad9a1cd39af2d148;hpb=7e2c31aba2aa9c2ffbcce235a8cc3c673aba2d2e;p=vpp.git

diff --git a/test/vpp_object.py b/test/vpp_object.py
index a1cf42fce35..088cc39ce0a 100644
--- a/test/vpp_object.py
+++ b/test/vpp_object.py
@@ -66,18 +66,17 @@ class VppObjectRegistry(object):
             return
         logger.info("REG: Removing VPP configuration for registered objects")
         # remove the config in reverse order as there might be dependencies
+        failed = []
         for obj in reversed(self._object_registry):
             if obj.query_vpp_config():
                 logger.info("REG: Removing configuration for %s" % obj)
                 obj.remove_vpp_config()
+                if obj.query_vpp_config():
+                    failed.append(obj)
             else:
                 logger.info(
                     "REG: Skipping removal for %s, configuration not present" %
                     obj)
-        failed = []
-        for obj in self._object_registry:
-            if obj.query_vpp_config():
-                failed.append(obj)
         self.unregister_all(logger)
         if failed:
             logger.error("REG: Couldn't remove configuration for object(s):")