Changeset 829

Timestamp:

07/14/07 21:17:08 (1 year ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/qa/help.py (modified) (1 diff)
• cherokee/trunk/qa/run-tests.py (modified) (4 diffs)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2007-07-14  Alvaro Lopez Ortega  <alvaro@alobbs.com>
-
+        * qa/run-tests.py, qa/help.py: Depending on the machine and
+        environment, ten additional seconds to start the server might not
+        be enough. This change adds a new parameter -r that allows to
+        specify how long the test runner should wait before running the
+        first one. Eg: CHEROKEE_TRACE="all" ./run-tests.py -v -c -r50
+        
-        * qa/run-tests.py: If the server runs with Valgrind, wait 10 more
-        seconds to start the tests. There were many occasions in which the

cherokee/trunk/qa/help.py

@@ -16 +16 @@
-  -t<NUM>       Number of threads of the server
-  -p<NUM>       Server port
+  -r<NUM>       Starting delay (secs)
-  -m<FLOAT>     Delay between tests (secs)
-

cherokee/trunk/qa/run-tests.py

@@ -27 +27 @@
-thds     = 1
-pause    = 0
+delay    = 0
-tpause   = 0.0
-ssl      = False
@@ -42 +43 @@
-
-server   = CHEROKEE_PATH
-delay    = SERVER_DELAY
-
-# Make the DocumentRoot directory
@@ -82 +82 @@
-    elif p[:2] == '-t': thds     = int(p[2:])
-    elif p[:2] == '-p': port     = int(p[2:])
+    elif p[:2] == '-r': delay    = int(p[2:])
-    elif p[:2] == '-m': tpause   = float(p[2:])
-    elif p[:2] == '-d': pause    = p[2:]
@@ -237 +238 @@
-        print
-
-        if valgrind != None:
-            delay += 10
-
-        for s in range(delay):
-
+SERVER_DELAY + 
-           sys.stdout.flush()
-           time.sleep(1)