commit eb42ef66316cf2eb4ae761a7dba132c86f7a7600 Author: Jan Tluka jtluka@redhat.com Date: Wed Jul 25 20:28:48 2012 +0200

Move _docleanup out from slave xmlrpc initialization

NetTest/NetTestController.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) --- diff --git a/NetTest/NetTestController.py b/NetTest/NetTestController.py index 6c047d3..4e34c90 100644 --- a/NetTest/NetTestController.py +++ b/NetTest/NetTestController.py @@ -114,6 +114,11 @@ class NetTestController:

info["configured_interfaces"] = []

+ rpc = self._get_machinerpc(machine_id) + + if self._docleanup: + rpc.machine_cleanup() + def _init_slave_session(self, machine_id): info = self._get_machineinfo(machine_id) hostname = info["hostname"] @@ -145,9 +150,6 @@ class NetTestController: logging.error("Handshake error with machine %s", hostname) raise Exception("Hanshake error")

- if self._docleanup: - rpc.machine_cleanup() - info["rpc"] = rpc

def _init_slave_logging(self, machine_id):