put .timestamp file inside /var/lib/lxc//

[tests.git] / system / TestSliver.py

diff --git a/system/TestSliver.py b/system/TestSliver.py
index 815afa3..c4b3fb8 100644 (file)
--- a/system/TestSliver.py
+++ b/system/TestSliver.py
@@ -1,3 +1,6 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 import utils
 import os, os.path
 import datetime
@@ -31,11 +34,9 @@ class TestSliver:
     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)
@@ -55,24 +56,27 @@ class TestSliver:
         dir_to_tar="/vservers/%s/var/log"%self.test_slice.name()
         return test_ssh.actual_command("tar -C %s -cf - ."%dir_to_tar)
     
-    def check_sanity (self):
-        print 'NOTE: slice sanity check scripts NOT (yet?) run in sudo'
+    def check_hooks (self):
+        print 'NOTE: slice hooks check scripts NOT (yet?) run in sudo'
         extensions = [ 'py','pl','sh' ]
-        path='tests/qaapi/qa/tests/slice/'
-        scripts=utils.locate_sanity_scripts ('sliver '+self.name(), path,extensions)
+        path='hooks/slice/'
+        scripts=utils.locate_hooks_scripts ('sliver '+self.name(), path,extensions)
         overall = True
         for script in scripts:
-            if not self.check_sanity_script (script):
+            if not self.check_hooks_script (script):
                 overall = False
         return overall
 
-    def check_sanity_script (self,local_script):
-        ssh_handle=self.create_test_ssh()
-        ssh_handle.copy_home(local_script)
-        scriptname=os.path.basename(local_script)
-        if ssh_handle.run("./"+scriptname) != 0:
-            print "WARNING: sanity check script %s FAILED"%scriptname
-            # xxx - temporary : ignore result and always return true for now
+    def check_hooks_script (self,local_script):
+        script_name=os.path.basename(local_script)
+        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
+            return True
+        else:
+            utils.header ("SUCCESS: sliver hook %s OK"%script_name)
+            return True