git://git.onelab.eu
/
tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ef481c7
)
added commands utility
author
Tony Mack
<tmack@cs.princeton.edu>
Thu, 31 Jan 2008 20:02:43 +0000
(20:02 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Thu, 31 Jan 2008 20:02:43 +0000
(20:02 +0000)
qaapi/qa/utils.py
patch
|
blob
|
history
diff --git
a/qaapi/qa/utils.py
b/qaapi/qa/utils.py
index
38132bf
..
52e359f
100644
(file)
--- a/
qaapi/qa/utils.py
+++ b/
qaapi/qa/utils.py
@@
-1,6
+1,7
@@
# $Id$
import time
import os
# $Id$
import time
import os
+import commands
def header(message):
now=time.strftime("%H:%M:%S", time.localtime())
def header(message):
now=time.strftime("%H:%M:%S", time.localtime())
@@
-16,6
+17,11
@@
def popen(command, fatal=True):
errors = filter(remove_set_x, stderr.readlines())
if fatal and errors:
errors = filter(remove_set_x, stderr.readlines())
if fatal and errors:
- raise Exception, "
\n".join(errors)
+ raise Exception, "
".join(errors)
return (output, errors)
return (output, errors)
-
+
+def commands(command, fatal = True):
+ (status, output) = commands.getstatusoutput(command)
+ if fatal and not status == 0:
+ raise Exception, "%(command)s Failed:\n%(output)s" % locals()
+ return (status, output)