moving to multi-plcs daily tests

[tests.git] / system / utils.py

diff --git a/system/utils.py b/system/utils.py
index 2219848..df34cd9 100644 (file)
--- a/system/utils.py
+++ b/system/utils.py
@@ -1,20 +1,73 @@
 # $Id$
-import time
-import os
-import pprint
+import time, os, re, glob, sys
+from pprint import PrettyPrinter
+
+options={}
+
+def init_options(options_arg):
+    global options
+    options=options_arg
 
 # how could this accept a list again ?
 def header(message):
     now=time.strftime("%H:%M:%S", time.localtime())
     print "*",now,'--',message
 
-def show_spec(message,spec,depth=2):
+def pprint(message,spec,depth=2):
     now=time.strftime("%H:%M:%S", time.localtime())
     print ">",now,"--",message
-    pprint.PrettyPrinter(indent=6,depth=depth).pprint(spec)
+    PrettyPrinter(indent=8,depth=depth).pprint(spec)
+
+
+
+def system(command,background=False):
+    if background: command += " &"
+    if options.dry_run:
+        print 'dry_run:',command
+        return 0
+    else:
+        now=time.strftime("%H:%M:%S", time.localtime())
+        print "*",now,'--',
+        sys.stdout.flush()
+        return os.system("set -x; " + 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)
 
-def system(command):
+
+
+# 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("?",".")
+    return re.compile(pattern).match(string)
+    
+def locate_sanity_scripts (message,path,extensions):
+    print message,'searching',path,'for extensions',extensions
+    scripts=[]
+    for ext in extensions:
+        scripts += glob.glob (path+'/*.'+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
-    return os.system("set -x; " + command)
+    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)
+
+