From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sun, 1 Mar 2015 07:26:56 +0000 (+0100)
Subject: Merge branch 'master' into noinitscript
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Fheads%2Fnoinitscript;hp=-c;p=tests.git

Merge branch 'master' into noinitscript
---

a215a83708958198c47638127e8c11331321721e
diff --combined system/TestPlc.py
index 9e39768,0b07291..d4f1f29
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@@ -107,7 -107,7 +107,7 @@@ class slice_mapper__tasks (object)
                  test_site = TestSite(self,site_spec)
                  test_slice=TestSlice(self,test_site,slice_spec)
                  tasks += slice_method (test_slice, self.options)
-             return Completer (tasks).run (decorator_self.timeout, decorator_self.silent, decorator_self.period)
+             return Completer (tasks, message=method.__name__).run (decorator_self.timeout, decorator_self.silent, decorator_self.period)
          # restore the doc text from the TestSlice method even if a bit odd
          wrappee.__name__ = method.__name__
          wrappee.__doc__ = slice_method.__doc__
@@@ -140,8 -140,7 +140,8 @@@ class TestPlc
          'plc_install', 'plc_configure', 'plc_start', SEP,
          'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP,
          'plcapi_urls','speed_up_slices', SEP,
 -        'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP,
 +        # noinitscript branch: 'initscripts',
 +        'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP,
  # slices created under plcsh interactively seem to be fine but these ones don't have the tags
  # keep this our of the way for now
          'check_vsys_defaults_ignore', SEP,
@@@ -161,9 -160,7 +161,9 @@@
          # but as the stress test might take a while, we sometimes missed the debug mode..
          'probe_kvm_iptables',
          'ping_node', 'ssh_node_debug', 'plcsh_stress_test@1', SEP,
 -        'ssh_node_boot', 'node_bmlogs', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts_ignore', SEP,
 +        'ssh_node_boot', 'node_bmlogs', 'ssh_slice', 'ssh_slice_basics',
 +        # noinitscript branch: 'check_initscripts_ignore',
 +        SEP,
          'ssh_slice_sfa@1', SEPSFA, 
          'sfa_rspec_empty@1', 'sfa_allocate_empty@1', 'sfa_provision_empty@1','sfa_check_slice_plc_empty@1', SEPSFA,
          'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA,
@@@ -179,8 -176,7 +179,8 @@@
      other_steps = [ 
          'export', 'show_boxes', 'super_speed_up_slices', SEP,
          'check_hooks', 'plc_stop', 'plcvm_start', 'plcvm_stop', SEP,
 -        'delete_initscripts', 'delete_nodegroups','delete_all_sites', SEP,
 +        # noinitscript branch: 'delete_initscripts',
 +        'delete_nodegroups','delete_all_sites', SEP,
          'delete_sites', 'delete_nodes', 'delete_slices', 'keys_clean', SEP,
          'delete_leases', 'list_leases', SEP,
          'populate', SEP,
@@@ -1044,7 -1040,8 +1044,8 @@@
          utils.header("checking nodes boot state (expected %s)"%target_boot_state)
          tasks = [ CompleterTaskBootState (self,hostname) \
                        for (hostname,_) in self.all_node_infos() ]
-         return Completer (tasks).run (timeout, graceout, period)
+         message = 'check_boot_state={}'.format(target_boot_state)
+         return Completer (tasks, message=message).run (timeout, graceout, period)
  
      def nodes_booted(self):
          return self.nodes_check_boot_state('boot',timeout_minutes=30,silent_minutes=28)
@@@ -1069,7 -1066,7 +1070,7 @@@
          period=timedelta (seconds=period_seconds)
          node_infos = self.all_node_infos()
          tasks = [ CompleterTaskPingNode (h) for (h,_) in node_infos ]
-         return Completer (tasks).run (timeout, graceout, period)
+         return Completer (tasks, message='ping_node').run (timeout, graceout, period)
  
      # ping node before we try to reach ssh, helpful for troubleshooting failing bootCDs
      def ping_node (self):
@@@ -1084,15 -1081,17 +1085,17 @@@
          vservername=self.vservername
          if debug: 
              message="debug"
+             completer_message = 'ssh_node_debug'
              local_key = "keys/%(vservername)s-debug.rsa"%locals()
          else: 
              message="boot"
+             completer_message = 'ssh_node_boot'
  	    local_key = "keys/key_admin.rsa"
          utils.header("checking ssh access to nodes (expected in %s mode)"%message)
          node_infos = self.all_node_infos()
          tasks = [ CompleterTaskNodeSsh (nodename, qemuname, local_key, boot_state=message) \
                        for (nodename,qemuname) in node_infos ]
-         return Completer (tasks).run (timeout, graceout, period)
+         return Completer (tasks, message=completer_message).run (timeout, graceout, period)
          
      def ssh_node_debug(self):
          "Tries to ssh into nodes in debug mode with the debug ssh key"
@@@ -1165,7 -1164,7 +1168,7 @@@
                  test_node = TestNode (self,test_site,node)
                  test_sliver = TestSliver (self, test_node, test_slice)
                  tasks.append ( CompleterTaskInitscript (test_sliver, stamp))
-         return Completer (tasks).run (timedelta(minutes=5), timedelta(minutes=4), timedelta(seconds=10))
+         return Completer (tasks, message='check_initscripts').run (timedelta(minutes=5), timedelta(minutes=4), timedelta(seconds=10))
  	    
      def check_initscripts(self):
          "check that the initscripts have triggered"
@@@ -1355,7 -1354,7 +1358,7 @@@
          period  = timedelta (seconds=period_seconds)
          tasks = [ CompleterTaskSystemSlice (test_node, self.options.dry_run) \
                        for test_node in self.all_nodes() ]
-         return Completer (tasks) . run (timeout, silent, period)
+         return Completer (tasks, message='_check_system_slice') . run (timeout, silent, period)
  
      def plcsh_stress_test (self):
          "runs PLCAPI stress test, that checks Add/Update/Delete on all types - preserves contents"