X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=dd422a8ee1fb97655bd1951780b207e8ec491059;hb=26a60b05018f1edcd6691be1878bef08eb1d1c8c;hp=c9b621baf0ded72b4f34aa7b4e46382b109e58e2;hpb=a161111621b56df355e7473ba28d0e667105409e;p=tests.git diff --git a/system/TestPlc.py b/system/TestPlc.py index c9b621b..dd422a8 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -71,7 +71,7 @@ def ignore_result (method): ref_name=method.__name__.replace('_ignore','').replace('force_','') ref_method=TestPlc.__dict__[ref_name] result=ref_method(self) - print "Actual - but ignored - result for %(ref_name)s is %(result)s"%locals() + print "Actual (but ignored) result for %(ref_name)s is %(result)s"%locals() return Ignored (result) wrappee.__doc__="ignored version of " + method.__name__.replace('_ignore','').replace('ignore_','') return wrappee @@ -83,7 +83,6 @@ def ignore_result (method): class slice_mapper__tasks (object): # could not get this to work with named arguments def __init__ (self,timeout_minutes,silent_minutes,period_seconds): - 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) @@ -170,7 +169,7 @@ class TestPlc: 'plc_db_dump' , 'plc_db_restore', SEP, 'check_netflow','check_drl', SEP, 'debug_nodemanager', SEP, - 'standby_1_through_20',SEP, + 'standby_1_through_20','yes','no',SEP, ] @staticmethod @@ -1776,3 +1775,7 @@ class TestPlc: def standby_19(): pass @standby_generic def standby_20(): pass + + # convenience for debugging the test logic + def yes (self): return True + def no (self): return False