[Cherokee-commits] rev 1224 - in cherokee/branches/0.6

[cherokee at cherokee-project.com]

Author: alo
Date: 2008-03-10 23:03:54 +0100 (Mon, 10 Mar 2008)
New Revision: 1224
Log:

Get the changeset with:
  svn diff -r 1223:1224 svn://svn.cherokee-project.com/

Modified:
  cherokee/branches/0.6/ChangeLog
    9 +++++++++
  cherokee/branches/0.6/qa/126-SCGI.py
    2 +-
  cherokee/branches/0.6/qa/127-SCGI-Post.py
    2 +-
  cherokee/branches/0.6/qa/140-SCGI-EmptyVars.py
    2 +-
  cherokee/branches/0.6/qa/141-FastCGI-EmptyVars.py
    2 +-
  cherokee/branches/0.6/qa/142-SCGI-ExtraVars.py
    2 +-
  cherokee/branches/0.6/qa/util.py
    7 +++++++

Modified: cherokee/branches/0.6/ChangeLog
===================================================================
--- cherokee/branches/0.6/ChangeLog	2008-03-07 09:21:06 UTC (rev 1223)
+++ cherokee/branches/0.6/ChangeLog	2008-03-10 22:03:54 UTC (rev 1224)
@@ -1,3 +1,12 @@
+2008-03-10  Alvaro Lopez Ortega  <alvaro at alobbs.com>
+
+	* qa/util.py (get_free_port): Added new function to assign the tcp
+	ports dynamically.
+
+	* qa/127-SCGI-Post.py, qa/140-SCGI-EmptyVars.py, qa/126-SCGI.py,
+	qa/141-FastCGI-EmptyVars.py, qa/142-SCGI-ExtraVars.py: Adapted to
+	use get_free_port().
+
 2008-03-07  Alvaro Lopez Ortega  <alvaro at alobbs.com>
 
 	* cherokee.conf.sample.pre: Removed a couple of "include" entries.

Modified: cherokee/branches/0.6/qa/126-SCGI.py
===================================================================
--- cherokee/branches/0.6/qa/126-SCGI.py	2008-03-07 09:21:06 UTC (rev 1223)
+++ cherokee/branches/0.6/qa/126-SCGI.py	2008-03-10 22:03:54 UTC (rev 1224)
@@ -3,7 +3,7 @@
 
 DIR   = "/SCGI1/"
 MAGIC = "Cherokee and SCGI rocks!"
-PORT  = 5001
+PORT  = get_free_port()
 
 SCRIPT = """
 from pyscgi import *

Modified: cherokee/branches/0.6/qa/127-SCGI-Post.py
===================================================================
--- cherokee/branches/0.6/qa/127-SCGI-Post.py	2008-03-07 09:21:06 UTC (rev 1223)
+++ cherokee/branches/0.6/qa/127-SCGI-Post.py	2008-03-10 22:03:54 UTC (rev 1224)
@@ -3,7 +3,7 @@
 
 DIR   = "/SCGI2/"
 MAGIC = "Cherokee and SCGI rocks!"
-PORT  = 5002
+PORT  = get_free_port()
 
 SCRIPT = """
 from pyscgi import *

Modified: cherokee/branches/0.6/qa/140-SCGI-EmptyVars.py
===================================================================
--- cherokee/branches/0.6/qa/140-SCGI-EmptyVars.py	2008-03-07 09:21:06 UTC (rev 1223)
+++ cherokee/branches/0.6/qa/140-SCGI-EmptyVars.py	2008-03-10 22:03:54 UTC (rev 1224)
@@ -2,7 +2,7 @@
 from base import *
 
 DIR  = "/SCGI3/"
-PORT = 5003
+PORT = get_free_port()
 
 SCRIPT = """
 from pyscgi import *

Modified: cherokee/branches/0.6/qa/141-FastCGI-EmptyVars.py
===================================================================
--- cherokee/branches/0.6/qa/141-FastCGI-EmptyVars.py	2008-03-07 09:21:06 UTC (rev 1223)
+++ cherokee/branches/0.6/qa/141-FastCGI-EmptyVars.py	2008-03-10 22:03:54 UTC (rev 1224)
@@ -3,7 +3,7 @@
 
 DIR   = "/FCGI-EmptyVars/"
 MAGIC = "Cherokee and FastCGI rocks!"
-PORT  = 5004
+PORT  = get_free_port()
 
 SCRIPT = """
 from fcgi import *

Modified: cherokee/branches/0.6/qa/142-SCGI-ExtraVars.py
===================================================================
--- cherokee/branches/0.6/qa/142-SCGI-ExtraVars.py	2008-03-07 09:21:06 UTC (rev 1223)
+++ cherokee/branches/0.6/qa/142-SCGI-ExtraVars.py	2008-03-10 22:03:54 UTC (rev 1224)
@@ -2,7 +2,7 @@
 from base import *
 
 DIR  = "/SCGI4/"
-PORT = 5005
+PORT = get_free_port()
 
 HDR1 = "X-Whatever"
 VAL1 = "Value1"

Modified: cherokee/branches/0.6/qa/util.py
===================================================================
--- cherokee/branches/0.6/qa/util.py	2008-03-07 09:21:06 UTC (rev 1223)
+++ cherokee/branches/0.6/qa/util.py	2008-03-10 22:03:54 UTC (rev 1224)
@@ -137,3 +137,10 @@
 
 def print_key (key, val):
     print "%10s: %s" % (key, val)
+
+
+__free_port = 5000
+def get_free_port():
+    global __free_port
+    __free_port += 1
+    return __free_port