From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 27 Aug 2013 12:48:58 +0000 (+0200)
Subject: Merge branch 'master' into sfa-geni-v3
X-Git-Tag: tests-5.3-1~3
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=957bf73e13cfd2f74bcc8cda9ce832b7da06eacf;hp=-c;p=tests.git

Merge branch 'master' into sfa-geni-v3
---

957bf73e13cfd2f74bcc8cda9ce832b7da06eacf
diff --combined system/TestPlc.py
index cc1fe6f,365add9..1dcc585
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@@ -64,6 -64,36 +64,36 @@@ def slice_mapper (method)
      actual.__doc__=TestSlice.__dict__[method.__name__].__doc__
      return actual
  
+ # a variant that expects the TestSlice method to return a list of CompleterTasks that
+ # are then merged into a single Completer run to avoid wating for all the slices
+ # esp. useful when a test fails of course
+ # because we need to pass arguments we use a class instead..
+ class slice_mapper__tasks (object):
+     # could not get this to work with named arguments
+     def __init__ (self,timeout_minutes,silent_minutes,period_seconds):
+         print "self",self
+         print "timeout_minutes,silent_minutes,period_seconds",timeout_minutes,silent_minutes,period_seconds
+         self.timeout=timedelta(minutes=timeout_minutes)
+         self.silent=timedelta(minutes=silent_minutes)
+         self.period=timedelta(seconds=period_seconds)
+     def __call__ (self, method):
+         decorator_self=self
+         # compute augmented method name
+         method_name = method.__name__ + "__tasks"
+         # locate in TestSlice
+         slice_method = TestSlice.__dict__[ method_name ]
+         def wrappee(self):
+             tasks=[]
+             for slice_spec in self.plc_spec['slices']:
+                 site_spec = self.locate_site (slice_spec['sitename'])
+                 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)
+         # restore the doc text from the TestSlice method even if a bit odd
+         wrappee.__doc__ = slice_method.__doc__
+         return wrappee
+ 
  def auth_sfa_mapper (method):
      def actual(self):
          overall=True
@@@ -98,7 -128,7 +128,7 @@@ class TestPlc
          'sfi_configure@1', 'sfa_add_site@1','sfa_add_pi@1', SEPSFA,
          'sfa_add_user@1', 'sfa_update_user@1', 'sfa_add_slice@1', 'sfa_renew_slice@1', SEPSFA,
          'sfa_discover@1', 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
 -        'sfi_list@1', 'sfi_show@1', 'sfi_slices@1', 'sfa_utest@1', SEPSFA,
 +        'sfi_list@1', 'sfi_show@1', 'sfa_utest@1', SEPSFA,
          # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot
          # but as the stress test might take a while, we sometimes missed the debug mode..
          'ssh_node_debug@1', 'plcsh_stress_test@1', SEP,
@@@ -1135,10 -1165,11 +1165,11 @@@
                  test_slice.create_slice()
          return True
          
-     @slice_mapper
+     @slice_mapper__tasks(20,10,15)
      def ssh_slice(self): pass
-     @slice_mapper
+     @slice_mapper__tasks(20,19,15)
      def ssh_slice_off (self): pass
+ 
      @slice_mapper
      def ssh_slice_basics(self): pass
  
@@@ -1529,6 -1560,8 +1560,6 @@@
      @auth_sfa_mapper
      def sfi_show(self): pass
      @auth_sfa_mapper
 -    def sfi_slices(self): pass
 -    @auth_sfa_mapper
      def ssh_slice_sfa(self): pass
      @auth_sfa_mapper
      def sfa_delete_user(self): pass