From 43b342fe222174597ee6ba6a765a6a6419678c05 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 10 Feb 2010 17:25:26 +0000 Subject: [PATCH] --- system/TestSliceSfa.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py index 1a1397d..970a9f8 100644 --- a/system/TestSliceSfa.py +++ b/system/TestSliceSfa.py @@ -50,7 +50,7 @@ class TestSliceSfa: return \ self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t slice %s.main.sfaslicea1"%auth)==0 - def check_slice_sfa(self,options,timeout_minutes=40,silent_minutes=4,period=15): + def check_slice_sfa(self,options,timeout_minutes=40,silent_minutes=30,period=15): timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes) graceout = datetime.datetime.now()+datetime.timedelta(minutes=silent_minutes) # locate a key @@ -74,11 +74,9 @@ class TestSliceSfa: for hostname in tocheck: (site_spec,node_spec) = self.test_plc.locate_hostname(hostname) date_test_ssh = TestSsh (hostname,key=remote_privatekey,username=self.name()) - if datetime.datetime.now() >= graceout: - utils.header('Trying to enter into slice %s@%s'%(self.name(),hostname)) - # this can be ran locally as we have the key - date = date_test_ssh.run("echo hostname ; hostname; echo id; id; echo uname -a ; uname -a")==0 - if date: + command = date_test_ssh.actual_command("echo hostname ; hostname; echo id; id; echo uname -a ; uname -a") + date = utils.system (command, silent=datetime.datetime.now() < graceout) + if date==0: utils.header("Successfuly entered slice %s on %s"%(self.name(),hostname)) tocheck.remove(hostname) else: -- 2.43.0