actual.__doc__=TestSlice.__dict__[method.__name__].__doc__
return actual
+# run a step but return True so that we can go on
+def ignore_result (method):
+ def wrappee (self):
+ # ssh_slice_ignore->ssh_slice
+ 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()
+ return Ignored (result)
+ wrappee.__doc__="ignored version of " + method.__name__.replace('_ignore','').replace('ignore_','')
+ return wrappee
+
# 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
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)
actual.__doc__=TestAuthSfa.__dict__[method.__name__].__doc__
return actual
+class Ignored:
+ def __init__ (self,result):
+ self.result=result
+
SEP='<sep>'
SEPSFA='<sep_sfa>'
# 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,
- 'ssh_node_boot@1', 'node_bmlogs@1', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts', SEP,
+ 'ssh_node_boot@1', 'node_bmlogs@1', 'ssh_slice', 'ssh_slice_basics', 'check_initscripts_ignore', SEP,
'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA,
'cross_check_tcp@1', 'check_system_slice', SEP,
# check slices are turned off properly
'empty_slices', 'ssh_slice_off', SEP,
# check they are properly re-created with the same name
- 'fill_slices', 'ssh_slice', SEP,
- 'force_gather_logs', SEP,
+ 'fill_slices', 'ssh_slice_again_ignore', SEP,
+ 'gather_logs_force', SEP,
]
other_steps = [
'export', 'show_boxes', SEP,
'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
#command gets run in the plc's vm
def host_to_guest(self,command):
- if self.options.plcs_use_lxc:
- return "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null %s %s"%(self.vserverip,command)
- else:
- return "vserver %s exec %s"%(self.vservername,command)
+ return "virsh -c lxc:/// lxc-enter-namespace %s /bin/bash -c '%s'" %(self.vservername,command)
+# return "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null %s %s"%(self.vserverip,command)
+ # this /vservers thing is legacy...
def vm_root_in_host(self):
- if self.options.plcs_use_lxc:
- return "/vservers/%s/rootfs/"%(self.vservername)
- else:
- return "/vservers/%s"%(self.vservername)
+ return "/vservers/%s/"%(self.vservername)
def vm_timestamp_path (self):
- if self.options.plcs_use_lxc:
- return "/vservers/%s/%s.timestamp"%(self.vservername,self.vservername)
- else:
- return "/vservers/%s.timestamp"%(self.vservername)
+ return "/vservers/%s/%s.timestamp"%(self.vservername,self.vservername)
#start/stop the vserver
def start_guest_in_host(self):
- if self.options.plcs_use_lxc:
- return "virsh -c lxc:// start %s"%(self.vservername)
- else:
- return "vserver %s start"%(self.vservername)
+ return "virsh -c lxc:/// start %s"%(self.vservername)
def stop_guest_in_host(self):
- if self.options.plcs_use_lxc:
- return "virsh -c lxc:// destroy %s"%(self.vservername)
- else:
- return "vserver %s stop"%(self.vservername)
+ return "virsh -c lxc:/// destroy %s"%(self.vservername)
# xxx quick n dirty
def run_in_guest_piped (self,local,remote):
domain=socket.gethostname().split('.',1)[1]
fqdn="%s.%s"%(self.plc_spec['host_box'],domain)
print "export BUILD=%s"%self.options.buildname
- if self.options.plcs_use_lxc:
- print "export PLCHOSTLXC=%s"%fqdn
- else:
- print "export PLCHOSTVS=%s"%fqdn
+ print "export PLCHOSTLXC=%s"%fqdn
print "export GUESTNAME=%s"%self.plc_spec['vservername']
vplcname=self.plc_spec['vservername'].split('-')[-1]
print "export GUESTHOSTNAME=%s.%s"%(vplcname,domain)
"vserver delete the test myplc"
stamp_path=self.vm_timestamp_path()
self.run_in_host("rm -f %s"%stamp_path)
- if self.options.plcs_use_lxc:
- self.run_in_host("virsh -c lxc:// destroy %s"%self.vservername)
- self.run_in_host("virsh -c lxc:// undefine %s"%self.vservername)
- self.run_in_host("rm -fr /vservers/%s"%self.vservername)
- return True
- else:
- self.run_in_host("vserver --silent %s delete"%self.vservername)
- return True
+ self.run_in_host("virsh -c lxc:// destroy %s"%self.vservername)
+ self.run_in_host("virsh -c lxc:// undefine %s"%self.vservername)
+ self.run_in_host("rm -fr /vservers/%s"%self.vservername)
+ return True
### install
# historically the build was being fetched by the tests
repo_url = os.path.dirname(repo_url)
# invoke initvm (drop support for vs)
- script="ltest-initvm.sh"
+ script="lbuild-initvm.sh"
script_options=""
# pass the vbuild-nightly options to [lv]test-initvm
script_options += " -p %s"%self.options.personality
utils.system('rm %s'%tmpname)
return True
+# f14 is a bit odd in this respect, although this worked fine in guests up to f18
+# however using a vplc guest under f20 requires this trick
+# the symptom is this: service plc start
+# Starting plc (via systemctl): Failed to get D-Bus connection: \
+# Failed to connect to socket /org/freedesktop/systemd1/private: Connection refused
+# weird thing is the doc says f14 uses upstart by default and not systemd
+# so this sounds kind of harmless
def plc_start(self):
- "service plc start"
- self.run_in_guest('service plc start')
+ "service plc start (use a special trick to set SYSTEMCTL_SKIP_REDIRECT on f14)"
+ if self.options.fcdistro != 'f14':
+ self.run_in_guest ("service plc start")
+ else:
+ # patch /sbin/service so it does not reset environment
+ # this is because our own scripts in turn call service
+ self.run_in_guest ("sed -i -e 's,env -i ,,' /sbin/service")
+ self.run_in_guest("SYSTEMCTL_SKIP_REDIRECT=true /etc/init.d/plc start")
+ # retcod of service is not meaningful
return True
def plc_stop(self):
- "service plc stop"
- self.run_in_guest('service plc stop')
+ "service plc stop (use a special trick to set SYSTEMCTL_SKIP_REDIRECT on f14)"
+ if self.options.fcdistro != 'f14':
+ self.run_in_guest ("service plc stop")
+ else:
+ # patch /sbin/service so it does not reset environment
+ # this is because our own scripts in turn call service
+ self.run_in_guest ("sed -i -e 's,env -i ,,' /sbin/service")
+ self.run_in_guest("SYSTEMCTL_SKIP_REDIRECT=true /etc/init.d/plc stop")
+ # retcod of service is not meaningful
return True
def vs_start (self):
@slice_mapper__tasks(20,19,15)
def ssh_slice_off (self): pass
+ # use another name so we can exclude/ignore it from the tests on the nightly command line
+ def ssh_slice_again(self): return self.ssh_slice()
+ # note that simply doing ssh_slice_again=ssh_slice would kind od work too
+ # but for some reason the ignore-wrapping thing would not
+
@slice_mapper
def ssh_slice_basics(self): pass
utils.header('Database restored from ' + dump)
+ @staticmethod
+ def create_ignore_steps ():
+ for step in TestPlc.default_steps + TestPlc.other_steps:
+ # default step can have a plc qualifier
+ if '@' in step: (step,qualifier)=step.split('@')
+ # or be defined as forced or ignored by default
+ for keyword in ['_ignore','_force']:
+ if step.endswith (keyword): step=step.replace(keyword,'')
+ if step == SEP or step == SEPSFA : continue
+ method=getattr(TestPlc,step)
+ name=step+'_ignore'
+ wrapped=ignore_result(method)
+# wrapped.__doc__ = method.__doc__ + " (run in ignore-result mode)"
+ setattr(TestPlc, name, wrapped)
+
+# @ignore_result
+# def ssh_slice_again_ignore (self): pass
+# @ignore_result
+# def check_initscripts_ignore (self): pass
+
def standby_1_through_20(self):
"""convenience function to wait for a specified number of minutes"""
pass
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
git://git.onelab.eu / tests.git / blobdiff