X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2Futils.py;h=b7fd8ef08a5463b9c0ea3b92947981eb2aea0225;hb=4297f83e55247a16c587d1aae4205f198d17fd69;hp=42eb93b27d89f5c51b4238fa307dea98e07384e0;hpb=5abc2125f8a5aeb58783affd6a3b532f02acd216;p=tests.git diff --git a/system/utils.py b/system/utils.py index 42eb93b..b7fd8ef 100644 --- a/system/utils.py +++ b/system/utils.py @@ -1,141 +1,86 @@ -# $Id$ -import time, os, re, glob +# Thierry Parmentelat +# Copyright (C) 2010 INRIA +# +import time, os, re, glob, sys from pprint import PrettyPrinter options={} def init_options(options_arg): global options - options=options_arg + options = options_arg # how could this accept a list again ? def header(message): - now=time.strftime("%H:%M:%S", time.localtime()) - print "*",now,'--',message + now = time.strftime("%H:%M:%S", time.localtime()) + print("*", now, '--', message) -def pprint(message,spec,depth=2): - now=time.strftime("%H:%M:%S", time.localtime()) - print ">",now,"--",message - PrettyPrinter(indent=8,depth=depth).pprint(spec) +def pprint(message, spec, depth=2): + now = time.strftime("%H:%M:%S", time.localtime()) + print(">", now, "--", message) + PrettyPrinter(indent=8, depth=depth).pprint(spec) -# quick & dirty - should probably use the parseroption object instead -# and move to TestMain as well -exclude_options_keys = [ 'ensure_value' , 'read_file', 'read_module' ] -def show_options (message,options): - now=time.strftime("%H:%M:%S", time.localtime()) - print ">",now,"--",message - for k in dir(options): - if k.find("_")==0: continue - if k in exclude_options_keys: continue - print " ",k,":",getattr(options,k) - -def show_site_spec (site): - print '* ======== site',site['site_fields']['name'] - for (k,v) in site.iteritems(): - if k=='nodes': - if v: - print '* \t\t','nodes : ', - for node in v: - print node['node_fields']['hostname'],'', - print '' - elif k=='users': - if v: - print '* \t\tusers : ', - for user in v: - print user['name'],'', - print '' - elif k == 'site_fields': - print '* \t\tlogin_base',':',v['login_base'] - elif k == 'address_fields': - pass - else: - print '* \t\t',k, - PrettyPrinter(indent=8,depth=2).pprint(v) - -def show_initscript_spec (initscript): - print '* ======== initscript',initscript['initscript_fields']['name'] -def show_key_spec (key): - print '* ======== key',key['name'] -def show_slice_spec (slice): - print '* ======== slice',slice['slice_fields']['name'] - for (k,v) in slice.iteritems(): - if k=='nodenames': - if v: - print '* \t\tnodes : ', - for nodename in v: - print nodename,'', - print '' - elif k=='usernames': - if v: - print '* \t\tusers : ', - for username in v: - print username,'', - print '' - elif k=='slice_fields': - print '* \t\tfields',':', - print 'max_nodes=',v['max_nodes'], - print '' - else: - print '* \t\t',k,v - -def show_test_spec (message,all_plc_specs): - now=time.strftime("%H:%M:%S", time.localtime()) - print "*",now,"--",message - for plc_spec in all_plc_specs: - show_test_spec_pass (plc_spec,1) - show_test_spec_pass (plc_spec,2) - -def show_test_spec_pass (plc_spec,passno): - for (key,val) in plc_spec.iteritems(): - if passno == 2: - if key == 'sites': - for site in val: - show_site_spec(site) - elif key=='initscripts': - for initscript in val: - show_initscript_spec (initscript) - elif key=='slices': - for slice in val: - show_slice_spec (slice) - elif key=='keys': - for key in val: - show_key_spec (key) - elif passno == 1: - if key not in ['sites','initscripts','slices','keys']: - print '* \t',key,':',val - -def system(command,background=False): - if background: command += " &" - if options.dry_run: - print 'dry_run:',command +def system(command, background=False, silent=False, dry_run=None): + dry_run = dry_run if dry_run is not None else getattr(options, 'dry_run', False) + if dry_run: + print('dry_run:', command) return 0 + + if silent : + if command.find(';') >= 0: + command = "({}) 2> /dev/null".format(command) + else: command += " 2> /dev/null" + if background: + command += " &" + if silent: + print('.', end=' ') + sys.stdout.flush() else: - return os.system("set -x; " + command) + now = time.strftime("%H:%M:%S", time.localtime()) + # don't show in summary + print("->", now, '--', end=' ') + sys.stdout.flush() + if not silent: + command = "set -x; " + command + return os.system(command) ### WARNING : this ALWAYS does its job, even in dry_run mode def output_of (command): - import commands -# if options.dry_run: -# print 'dry_run',command -# return (0,'[[dry-run - fake output]]') -# else: - (code,string) = commands.getstatusoutput(command) - return (code,string) + import subprocess + (code, string) = subprocess.getstatusoutput(command) + return (code, string) + # convenience: translating shell-like pattern into regexp def match (string, pattern): # tmp - there's probably much simpler # rewrite * into .*, ? into . - pattern=pattern.replace("*",".*") - pattern=pattern.replace("?",".") + pattern = pattern.replace("*",".*") + pattern = pattern.replace("?",".") return re.compile(pattern).match(string) -def locate_sanity_scripts (message,path,extensions): - print message,'searching',path,'for extensions',extensions - scripts=[] +def locate_hooks_scripts (message, path, extensions): + print(message, 'searching', path, 'for extensions', extensions) + scripts = [] for ext in extensions: - scripts += glob.glob (path+'/*.'+ext) + # skip helper programs + scripts += glob.glob (path+'/[a-zA-Z]*.' + ext) return scripts +# quick & dirty - should probably use the parseroption object instead +# and move to TestMain as well +exclude_options_keys = [ 'ensure_value' , 'read_file', 'read_module' ] +def show_options (message, options): + now = time.strftime("%H:%M:%S", time.localtime()) + print(">", now, "--", message) + for k in dir(options): + if k.find("_") == 0: + continue + if k in exclude_options_keys: + continue + print(" ", k, ":", getattr(options, k)) + + +