commit 791fd48e6a95a10dfef60ac442f2a34f225e672a Author: Radek Pazdera rpazdera@redhat.com Date: Fri Jun 8 12:19:26 2012 +0200
NetTestController: Adding missing cleanup
Call to _cleanup() was added to 'all_dump' and 'config_only' actions, so the slaves are properly deconfigured when '-c' argument is present.
Signed-off-by: Radek Pazdera rpazdera@redhat.com
NetTest/NetTestController.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) --- diff --git a/NetTest/NetTestController.py b/NetTest/NetTestController.py index 8f46bcb..5455921 100644 --- a/NetTest/NetTestController.py +++ b/NetTest/NetTestController.py @@ -200,10 +200,14 @@ class NetTestController: def all_dump_recipe(self): self._prepare() pprint(self._recipe) + if self._docleanup: + self._cleanup() return True
def config_only_recipe(self): self._prepare() + if self._docleanup: + self._cleanup() return True
def run_recipe(self): @@ -218,7 +222,8 @@ class NetTestController: if not res: break
- self._cleanup() + if self._docleanup: + self._cleanup() return res
def eval_expression_recipe(self, expr):