Mailing List Archive

Revision: 6847
http://svn.cherokee-project.com/changeset/6847
Author: alo
Date: 2011-09-14 14:02:01 +0200 (Wed, 14 Sep 2011)
Log Message:
-----------
Fixes the 'secdownload' related QA tests. They failed if the QA test
run for more than a minute. The timeout is set to a week now.

Modified Paths:
--------------
cherokee/trunk/qa/203-secdownload1.py
cherokee/trunk/qa/204-secdownload2.py
cherokee/trunk/qa/205-secdownload3.py

Modified: cherokee/trunk/qa/203-secdownload1.py
===================================================================
--- cherokee/trunk/qa/203-secdownload1.py 2011-09-14 10:16:57 UTC (rev 6846)
+++ cherokee/trunk/qa/203-secdownload1.py 2011-09-14 12:02:01 UTC (rev 6847)
@@ -3,15 +3,23 @@
DIR = "sec_download_1"
DIR_REAL = "real_203"

-SECRET = "Alvaro_alobbs.com"
-MAGIC = str_random (100)
-FILE = "filename.ext"
+SECRET = "Alvaro_alobbs.com"
+MAGIC = str_random (100)
+FILE = "filename.ext"

+# TIMEOUT: The resource should not expire while the QA test is
+# running. If it did, the server would send a "410 Gone" response
+# instead of the expected "200 OK" one. The arbitrary limit of 1 week
+# should be more than enough for any QA/stress test.
+#
+TIMEOUT = 7 * 24 * 60 * 60 # 1 week
+
CONF = """
vserver!1!rule!2030!match = directory
vserver!1!rule!2030!match!directory = /%s
vserver!1!rule!2030!handler = secdownload
vserver!1!rule!2030!handler!secret = %s
+vserver!1!rule!2030!handler!timeout = %s
vserver!1!rule!2030!document_root = %s
"""

@@ -38,4 +46,4 @@
droot = self.Mkdir (www, DIR_REAL)
self.WriteFile (droot, FILE, 0444, MAGIC)

- self.conf = CONF % (DIR, SECRET, droot)
+ self.conf = CONF % (DIR, SECRET, TIMEOUT, droot)

Modified: cherokee/trunk/qa/204-secdownload2.py
===================================================================
--- cherokee/trunk/qa/204-secdownload2.py 2011-09-14 10:16:57 UTC (rev 6846)
+++ cherokee/trunk/qa/204-secdownload2.py 2011-09-14 12:02:01 UTC (rev 6847)
@@ -3,15 +3,17 @@
DIR = "sec_download_2"
DIR_REAL = "real_204"

-SECRET = "Alvaro_alobbs.com"
-MAGIC = str_random (100)
-FILE = "filename.ext"
+SECRET = "Alvaro_alobbs.com"
+MAGIC = str_random (100)
+FILE = "filename.ext"
+TIMEOUT = 7 * 24 * 60 * 60 # 1 week

CONF = """
vserver!1!rule!2040!match = directory
vserver!1!rule!2040!match!directory = /%s
vserver!1!rule!2040!handler = secdownload
vserver!1!rule!2040!handler!secret = %s
+vserver!1!rule!2030!handler!timeout = %s
vserver!1!rule!2040!document_root = %s
"""

@@ -26,4 +28,4 @@
droot = self.Mkdir (www, DIR_REAL)
self.WriteFile (droot, FILE, 0444, MAGIC)

- self.conf = CONF % (DIR, SECRET, droot)
+ self.conf = CONF % (DIR, SECRET, TIMEOUT, droot)

Modified: cherokee/trunk/qa/205-secdownload3.py
===================================================================
--- cherokee/trunk/qa/205-secdownload3.py 2011-09-14 10:16:57 UTC (rev 6846)
+++ cherokee/trunk/qa/205-secdownload3.py 2011-09-14 12:02:01 UTC (rev 6847)
@@ -3,15 +3,17 @@
DIR = "sec_download_3"
DIR_REAL = "real_205"

-SECRET = "Alvaro_alobbs.com"
-MAGIC = str_random (100)
-FILE = "filename.ext"
+SECRET = "Alvaro_alobbs.com"
+MAGIC = str_random (100)
+FILE = "filename.ext"
+TIMEOUT = 7 * 24 * 60 * 60 # 1 week

CONF = """
vserver!1!rule!2050!match = directory
vserver!1!rule!2050!match!directory = /%s
vserver!1!rule!2050!handler = secdownload
vserver!1!rule!2050!handler!secret = %s
+vserver!1!rule!2030!handler!timeout = %s
vserver!1!rule!2050!document_root = %s
"""

@@ -38,4 +40,4 @@
droot = self.Mkdir (www, DIR_REAL)
self.WriteFile (droot, FILE, 0444, MAGIC)

- self.conf = CONF % (DIR, SECRET, droot)
+ self.conf = CONF % (DIR, SECRET, TIMEOUT, droot)