Merge remote branch 'origin/master'

[tests.git] / system / TestSliver.py

diff --git a/system/TestSliver.py b/system/TestSliver.py
index 1947fdb..cde09e8 100644 (file)
--- a/system/TestSliver.py
+++ b/system/TestSliver.py
@@ -68,15 +68,14 @@ class TestSliver:
 
     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