Mailing List Archive

Revision: 6852
http://svn.cherokee-project.com/changeset/6852
Author: alo
Date: 2011-09-15 13:12:30 +0200 (Thu, 15 Sep 2011)
Log Message:
-----------
There were three more Front-Line Cache QA tests that required some
changes to run concurrently.

Modified Paths:
--------------
cherokee/trunk/qa/276-Flcache-cookie1.py
cherokee/trunk/qa/281-Flcache-expired1.py
cherokee/trunk/qa/282-Flcache-expired2.py

Modified: cherokee/trunk/qa/276-Flcache-cookie1.py
===================================================================
--- cherokee/trunk/qa/276-Flcache-cookie1.py 2011-09-14 22:19:35 UTC (rev 6851)
+++ cherokee/trunk/qa/276-Flcache-cookie1.py 2011-09-15 11:12:30 UTC (rev 6852)
@@ -1,7 +1,7 @@
+import itertools
from base import *

DIR = "flcache-cookie1"
-FILE = "test.cgi274"
CONTENT = "Front-line does not cache responses setting cookies"

CONF = """
@@ -22,16 +22,17 @@
""" %(globals())


-
class TestEntry (TestBase):
- def __init__ (self):
+ def __init__ (self, filename):
TestBase.__init__ (self, __file__)
- self.request = "GET /%s/%s HTTP/1.0\r\n" %(DIR, FILE) +\
+ self.request = "GET /%s/%s HTTP/1.0\r\n" %(DIR, filename) +\
"Connection: close\r\n"
self.expected_error = 200


class Test (TestCollection):
+ counter = itertools.count()
+
def __init__ (self):
TestCollection.__init__ (self, __file__)

@@ -41,13 +42,28 @@
self.delay = 1

def Prepare (self, www):
- d = self.Mkdir (www, DIR)
- self.WriteFile (d, FILE, 0755, CGI_CODE)
+ self.local_dir = self.Mkdir (www, DIR)

+ def JustBefore (self, www):
+ test_num = Test.counter.next()
+ self.filename = "test276-id%s-test%s" %(id(self), test_num)
+
+ # Write the new file
+ self.WriteFile (self.local_dir, self.filename, 0755, CGI_CODE)
+
+ # Create sub-request objects
+ self.Empty()
+
# First request
- obj = self.Add (TestEntry())
+ obj = self.Add (TestEntry (self.filename))
obj.expected_content = ['X-Cache: MISS', CONTENT]

# Second request
- obj = self.Add (TestEntry())
+ obj = self.Add (TestEntry (self.filename))
obj.expected_content = ['X-Cache: MISS', CONTENT]
+
+ def JustAfter (self, www):
+ # Clean up the local file
+ fp = os.path.join (self.local_dir, self.filename)
+ os.unlink (fp)
+ self.filename = None

Modified: cherokee/trunk/qa/281-Flcache-expired1.py
===================================================================
--- cherokee/trunk/qa/281-Flcache-expired1.py 2011-09-14 22:19:35 UTC (rev 6851)
+++ cherokee/trunk/qa/281-Flcache-expired1.py 2011-09-15 11:12:30 UTC (rev 6852)
@@ -1,8 +1,8 @@
import types
+import itertools
from base import *

DIR = "flcache-expired1"
-FILE = "test.cgi"
CONTENT = "Front-line checks back-end Cache-control"

CONF = """
@@ -23,14 +23,16 @@


class TestEntry (TestBase):
- def __init__ (self):
+ def __init__ (self, filename):
TestBase.__init__ (self, __file__)
- self.request = "GET /%s/%s HTTP/1.0\r\n" %(DIR, FILE) +\
+ self.request = "GET /%s/%s HTTP/1.0\r\n" %(DIR, filename) +\
"Connection: close\r\n"
self.expected_error = 200


class Test (TestCollection):
+ counter = itertools.count()
+
def __init__ (self):
TestCollection.__init__ (self, __file__)

@@ -40,13 +42,28 @@
self.delay = 1

def Prepare (self, www):
- d = self.Mkdir (www, DIR)
- self.WriteFile (d, FILE, 0755, CGI_CODE)
+ self.local_dir = self.Mkdir (www, DIR)

+ def JustBefore (self, www):
+ test_num = Test.counter.next()
+ self.filename = "test281-id%s-test%s" %(id(self), test_num)
+
+ # Write the new file
+ self.WriteFile (self.local_dir, self.filename, 0755, CGI_CODE)
+
+ # Create sub-request objects
+ self.Empty()
+
# Miss
- obj = self.Add (TestEntry())
+ obj = self.Add (TestEntry (self.filename))
obj.expected_content = [CONTENT, "X-Cache: MISS"]

# Miss
- obj = self.Add (TestEntry())
+ obj = self.Add (TestEntry (self.filename))
obj.expected_content = [CONTENT, "X-Cache: MISS"]
+
+ def JustAfter (self, www):
+ # Clean up the local file
+ fp = os.path.join (self.local_dir, self.filename)
+ os.unlink (fp)
+ self.filename = None

Modified: cherokee/trunk/qa/282-Flcache-expired2.py
===================================================================
--- cherokee/trunk/qa/282-Flcache-expired2.py 2011-09-14 22:19:35 UTC (rev 6851)
+++ cherokee/trunk/qa/282-Flcache-expired2.py 2011-09-15 11:12:30 UTC (rev 6852)
@@ -1,8 +1,8 @@
import types
+import itertools
from base import *

DIR = "flcache-expired2"
-FILE = "test.cgi"
CONTENT = "Front-line checks back-end 'Expires' header"

CONF = """
@@ -23,14 +23,16 @@


class TestEntry (TestBase):
- def __init__ (self):
+ def __init__ (self, filename):
TestBase.__init__ (self, __file__)
- self.request = "GET /%s/%s HTTP/1.0\r\n" %(DIR, FILE) +\
+ self.request = "GET /%s/%s HTTP/1.0\r\n" %(DIR, filename) +\
"Connection: close\r\n"
self.expected_error = 200


class Test (TestCollection):
+ counter = itertools.count()
+
def __init__ (self):
TestCollection.__init__ (self, __file__)

@@ -40,13 +42,28 @@
self.delay = 1

def Prepare (self, www):
- d = self.Mkdir (www, DIR)
- self.WriteFile (d, FILE, 0755, CGI_CODE)
+ self.local_dir = self.Mkdir (www, DIR)

+ def JustBefore (self, www):
+ test_num = Test.counter.next()
+ self.filename = "test282-id%s-test%s" %(id(self), test_num)
+
+ # Write the new file
+ self.WriteFile (self.local_dir, self.filename, 0755, CGI_CODE)
+
+ # Create sub-request objects
+ self.Empty()
+
# Miss
- obj = self.Add (TestEntry())
+ obj = self.Add (TestEntry (self.filename))
obj.expected_content = [CONTENT, "X-Cache: MISS"]

# Miss
- obj = self.Add (TestEntry())
+ obj = self.Add (TestEntry (self.filename))
obj.expected_content = [CONTENT, "X-Cache: MISS"]
+
+ def JustAfter (self, www):
+ # Clean up the local file
+ fp = os.path.join (self.local_dir, self.filename)
+ os.unlink (fp)
+ self.filename = None