Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
I have added two tests in order to close bugreport 1341. We can't rep…
…roduce it.
  • Loading branch information
skinkie committed Jun 8, 2012
1 parent 74dbfe1 commit 8127eeb
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 0 deletions.
33 changes: 33 additions & 0 deletions qa/296-EVHost4.py
@@ -0,0 +1,33 @@
from base import *

MAGIC = '<a href="http://www.alobbs.com">Alvaro</a> tests QA #296.'
DOMAIN = '296-qa.users.example.com'

CONF = """
vserver!2960!nick = test0296
vserver!2960!match = rehost
vserver!2960!match!regex!1 = ^296-qa
vserver!2960!document_root = %s
vserver!2960!evhost = evhost
vserver!2960!evhost!tpl_document_root = %s/${root_domain}/${subdomain1}/public
vserver!2960!rule!1!match = default
vserver!2960!rule!1!handler = file
"""

class Test (TestBase):
def __init__ (self):
TestBase.__init__ (self, __file__)
self.name = "EVHost: ${root_domain}/${subdomain1}"
self.request = "GET /file HTTP/1.1\r\n" +\
"Connection: Close\r\n" + \
"Host: %s\r\n" %(DOMAIN)
self.expected_error = 200
self.expected_content = MAGIC

def Prepare (self, www):
d1 = self.Mkdir (www, "test_296_general")
ev = self.Mkdir (www, "test_296_evhost")
d2 = self.Mkdir (ev, "%s/example/users/public"%(ev))

self.WriteFile (d2, "file", 0444, MAGIC)
self.conf = CONF % (d1, ev)
33 changes: 33 additions & 0 deletions qa/297-EVHost5.py
@@ -0,0 +1,33 @@
from base import *

MAGIC = '<a href="http://www.alobbs.com">Alvaro</a> tests QA #297.'
DOMAIN = '297-qa.users.example.com'

CONF = """
vserver!2970!nick = test0297
vserver!2970!match = rehost
vserver!2970!match!regex!1 = ^297-qa
vserver!2970!document_root = %s
vserver!2970!evhost = evhost
vserver!2970!evhost!tpl_document_root = %s/${subdomain1}/${subdomain2}/public
vserver!2970!rule!1!match = default
vserver!2970!rule!1!handler = file
"""

class Test (TestBase):
def __init__ (self):
TestBase.__init__ (self, __file__)
self.name = "EVHost: ${subdomain1}/${subdomain2}"
self.request = "GET /file HTTP/1.1\r\n" +\
"Connection: Close\r\n" + \
"Host: %s\r\n" %(DOMAIN)
self.expected_error = 200
self.expected_content = MAGIC

def Prepare (self, www):
d1 = self.Mkdir (www, "test_297_general")
ev = self.Mkdir (www, "test_297_evhost")
d2 = self.Mkdir (ev, "%s/users/297-qa/public"%(ev))

self.WriteFile (d2, "file", 0444, MAGIC)
self.conf = CONF % (d1, ev)

0 comments on commit 8127eeb

Please sign in to comment.