Changeset 993

Timestamp:

03/02/06 12:57:25

Author:

fumanchu

Message:

Benchmark: simpler, more inclusive detection of ab/apache not on system path.

Files:

• trunk/cherrypy/test/benchmark.py (modified) (1 diff)

trunk/cherrypy/test/benchmark.py

@@ -57 +57 @@
-def read_process(cmd, args=""):
-    pipein, pipeout = os.popen4("%s %s" % (cmd, args))
-output = pipeout.read()
-if (# Windows
-output.startswith("'%s' is not recognized" % cmd)
-# bash
-or re.match(r"bash: .*: (No such file|command not found)", output
-):
-    raise IOError('%s must be on your system path.' % cmd)
-
+try:
+    firstline = pipeout.readline()
+if (re.search(r"(not recognized|No such file|not found)", firstline,
+              re.IGNORECASE)):
+    raise IOError('%s must be on your system path.' % cmd
+output = firstline + pipeout.read()
+finally:
+    
-    return output
-