use output file

[tests.git] / system / TestSliver.py

diff --git a/system/TestSliver.py b/system/TestSliver.py
index f0238b3..cde09e8 100644 (file)
--- a/system/TestSliver.py
+++ b/system/TestSliver.py
@@ -47,27 +47,35 @@ class TestSliver:
         return self.test_ssh.copy("tcptest.py")==0 and \
             self.test_ssh.run(client_command,background=True)==0
 
+    # use the node's main ssh root entrance, as the slice entrance might be down
+    #def tar_var_logs (self):
+    #    return self.test_ssh.actual_command("sudo tar -C /var/log -cf - .")
     def tar_var_logs (self):
-        return self.test_ssh.actual_command("sudo tar -C /var/log -cf - .")
+        test_ssh=self.test_node.create_test_ssh()
+        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