import sys, os, os.path
from optparse import OptionParser
import traceback
-from time import strftime
import readline
import glob
+from datetime import datetime
import utils
from TestPlc import TestPlc, Ignored
subversion_id = "Now using git -- version tracker broken"
default_config = [ 'default' ]
- default_rspec_styles = [ 'pl', 'pg' ]
+# default_rspec_styles = [ 'pl', 'pg' ]
+ default_rspec_styles = [ 'pg' ]
default_build_url = "git://git.onelab.eu/tests"
help="Specify the set of hostnames for the boxes that host the nodes")
parser.add_option("-N","--nodes",action="append", dest="ips_vnode", default=[],
help="Specify the set of hostname/IP's to use for vnodes")
- parser.add_option ('-X', "--lxc",action='store_true',dest='plcs_use_lxc',default=True,
- help='use lxc-enabled plc boxes instead of vs-enabled ones')
- parser.add_option ('-S', "--vs",action='store_false',dest='plcs_use_lxc',
- help='use lxc-enabled plc boxes instead of vs-enabled ones')
parser.add_option("-s","--size",action="store",type="int",dest="size",default=1,
help="sets test size in # of plcs - default is 1")
parser.add_option("-q","--qualifier",action="store",type="int",dest="qualifier",default=None,
help="prompts before each step")
parser.add_option("-n","--dry-run", action="store_true", dest="dry_run", default=False,
help="Show environment and exits")
-# dropped when added Completer.py
-# parser.add_option("-r","--restart-nm", action="store_true", dest="forcenm", default=False,
-# help="Force the NM to restart in ssh_slices step")
parser.add_option("-t","--trace", action="store", dest="trace_file", default=None,
help="Trace file location")
(self.options, self.args) = parser.parse_args()
('personality','arg-personality',"linux64",None),
('pldistro','arg-pldistro',"onelab",None),
('fcdistro','arg-fcdistro','f14',None),
- ('plcs_use_lxc','arg-plcs-use-lxc',False,None),
) :
# print 'handling',recname
path=filename
if self.options.list_steps:
self.init_steps()
self.list_steps()
- return True
+ return 'SUCCESS'
# steps
if not self.options.steps:
self.options.exclude = [ step.replace('-','_') for step in self.options.exclude ]
self.options.ignore = [ step.replace('-','_') for step in self.options.ignore ]
+ # technicality, decorate known steps to produce the '_ignore' version
TestPlc.create_ignore_steps()
# exclude
raise
# provision on local substrate
- if self.options.plcs_use_lxc: LocalSubstrate.local_substrate.rescope (plcs_on_vs=False, plcs_on_lxc=True)
all_plc_specs = LocalSubstrate.local_substrate.provision(all_plc_specs,self.options)
# remember substrate IP address(es) for next run
ips_bplc_file.close()
ips_vplc_file=open('arg-ips-vplc','w')
for plc_spec in all_plc_specs:
- ips_vplc_file.write("%s\n"%plc_spec['PLC_API_HOST'])
+ ips_vplc_file.write("%s\n"%plc_spec['settings']['PLC_API_HOST'])
ips_vplc_file.close()
# ditto for nodes
ips_bnode_file=open('arg-ips-bnode','w')
# do all steps on all plcs
TIME_FORMAT="%H-%M-%S"
- TRACE_FORMAT="TRACE: %(plc_counter)d %(beg)s->%(end)s status=%(status)s step=%(stepname)s plc=%(plcname)s force=%(force)s\n"
+ TRACE_FORMAT="TRACE: %(plc_counter)d %(begin)s->%(seconds)ss=%(duration)s status=%(status)s step=%(stepname)s plc=%(plcname)s force=%(force)s\n"
for (stepname,method,force,cross,qualifier) in all_step_infos:
plc_counter=0
for (spec,plc_obj) in all_plcs:
across_plcs = [ o for (s,o) in all_plcs if o!=plc_obj ]
# run the step
- beg=strftime(TIME_FORMAT)
+ beg_time = datetime.now()
+ begin = beg_time.strftime(TIME_FORMAT)
if not spec['failed_step'] or force or self.options.interactive or self.options.keep_going:
skip_step=False
if self.options.interactive:
skip_step=True
elif answer in ['q','b']: # quit/bye
print 'Exiting'
- return
+ return 'FAILURE'
elif answer in ['d']: # dry_run
dry_run=self.options.dry_run
self.options.dry_run=True
msg="OK"
else:
msg="KO"
- overall_result='IGNORED'
+ # do not overwrite if FAILURE
+ if overall_result=='SUCCESS':
+ overall_result='IGNORED'
utils.header('********** %d IGNORED (%s) step %s on %s'%(plc_counter,msg,stepname,plcname))
status="%s[I]"%msg
elif step_result:
utils.header("********** %d SKIPPED Step %s on %s (%s)"%(plc_counter,stepname,plcname,why))
status="UNDEF"
if not self.options.dry_run:
- end=strftime(TIME_FORMAT)
+ delay = datetime.now()-beg_time
+ seconds = int(delay.total_seconds())
+ duration = str(delay)
# always do this on stdout
print TRACE_FORMAT%locals()
# duplicate on trace_file if provided
# wrapper to run, returns a shell-compatible result
# retcod:
# 0: SUCCESS
- # 1: SUCCESS but some ignored steps failed
- # 2: FAILED STEP
+ # 1: FAILURE
+ # 2: SUCCESS but some ignored steps failed
# 3: OTHER ERROR
def main(self):
try:
success=self.run()
if success == 'SUCCESS': return 0
- elif success == 'IGNORED': return 1
- else: return 2
+ elif success == 'IGNORED': return 2
+ else: return 1
except SystemExit:
print 'Caught SystemExit'
return 3
if __name__ == "__main__":
exit_code = TestMain().main()
- print 'run_log is exiting',exit_code
- sys.exit(TestMain().main())
+ print "TestMain exit code",exit_code
+ sys.exit(exit_code)