+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA
+#
import utils
import os, os.path
import datetime
def name (self):
return "%s@%s"%(self.test_slice.name(),self.test_node.name())
- def check_initscript(self,initscript):
- slice_spec=self.test_slice.slice_spec
- initscript = slice_spec['initscriptname']
- utils.header("Checking initscript %s on sliver %s"%(initscript,self.name()))
- return self.test_ssh.run("ls -l /tmp/%s.stamp"%initscript)==0
+ def check_initscript_stamp(self,stamp):
+ utils.header("Checking for initscript stamp %s on sliver %s"%(stamp,self.name()))
+ return self.test_ssh.run("ls -l /tmp/%s.stamp"%stamp)==0
def run_tcp_server (self,port,timeout=10):
server_command = "./tcptest.py server -p %d -t %d"%(port,timeout)
def check_hooks_script (self,local_script):
script_name=os.path.basename(local_script)
- utils.header ("SLIVER %s : running hooks check script %s"%(self.name(),script_name))
- ssh_handle=self.create_test_ssh()
- ssh_handle.copy_home(local_script)
- if ssh_handle.run("./"+script_name) != 0:
- utils.header ("WARNING: hooks check script %s FAILED"%script_name)
- print 'temporary : ignoring result and always return true for now'
+ utils.header ("SLIVER hook %s (%s)"%(script_name,self.name()))
+ test_ssh=self.create_test_ssh()
+ test_ssh.copy_home(local_script)
+ if test_ssh.run("./"+script_name) != 0:
+ utils.header ("WARNING: hooks check script %s FAILED (ignored)"%script_name)
#return False
return True
else:
- utils.header ("SUCCESS: sliver hooks check script %s OK"%script_name)
+ utils.header ("SUCCESS: sliver hook %s OK"%script_name)
return True