From 78cb838b2e2f9fbf48b7ec3584a213b7cfa6b358 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Fri, 10 Apr 2015 17:36:57 +0900 Subject: app_manager: Clean up apps harder Necessary for neutron functional tests so that a test won't interfere the next test in a run. Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- ryu/base/app_manager.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ryu/base/app_manager.py b/ryu/base/app_manager.py index f0137ea6..e45f9c28 100644 --- a/ryu/base/app_manager.py +++ b/ryu/base/app_manager.py @@ -28,6 +28,7 @@ import itertools import logging import sys import os +import gc from ryu import cfg from ryu import utils @@ -344,6 +345,10 @@ class AppManager(object): hub.joinall(services) finally: app_mgr.close() + for t in services: + t.kill() + hub.joinall(services) + gc.collect() @staticmethod def get_instance(): @@ -511,5 +516,7 @@ class AppManager(object): self._close(app) close_dict.clear() - close_all(self.applications) + for app_name in list(self.applications.keys()): + self.uninstantiate(app_name) + assert not self.applications close_all(self.contexts) -- cgit v1.2.3