Permalink
Browse files

git-svn-id: svn://cherokee-project.com/cherokee/trunk@2179 5dc97367-9…

…7f1-0310-9951-d761b3857238
  • Loading branch information...
1 parent 4ecb592 commit bc8d926589e0055e22999085c365a225bef0af3c @alobbs alobbs committed Oct 14, 2008
Showing with 194 additions and 189 deletions.
  1. +5 −0 ChangeLog
  2. +1 −1 qa/001-basic.py
  3. +1 −1 qa/002-MissingProtocol.py
  4. +1 −1 qa/003-UnknownMethod.py
  5. +1 −1 qa/004-UnknownMethod+MissingProtocol.py
  6. +1 −1 qa/005-Unknown-Protocol.py
  7. +1 −1 qa/006-Wrong-Protocol.py
  8. +1 −1 qa/007-Missing-Host.py
  9. +1 −1 qa/008-Broken-Request.py
  10. +1 −1 qa/009-DotDot.py
  11. +1 −1 qa/010-Dot.py
  12. +1 −1 qa/011-HeaderEntryTwice.py
  13. +1 −1 qa/012-Broken-Key.py
  14. +1 −1 qa/013-Broken-Key2.py
  15. +1 −1 qa/014-Broken-Key3.py
  16. +1 −1 qa/015-CGI-simple.py
  17. +1 −1 qa/016-CGI-pathinfo.py
  18. +1 −1 qa/017-CGI-pathinfo2.py
  19. +1 −1 qa/018-CGI-pathinfo3.py
  20. +1 −1 qa/019-HeadMethod.py
  21. +1 −1 qa/020-VirtualHost.py
  22. +1 −1 qa/021-VirtualHost2.py
  23. +1 −1 qa/022-NoHost.py
  24. +1 −1 qa/023-Host.py
  25. +1 −1 qa/024-Host+Port.py
  26. +1 −1 qa/025-Host-Broken.py
  27. +1 −1 qa/026-Host-Broken-Dot.py
  28. +1 −1 qa/027-Missing-File.py
  29. +1 −1 qa/028-Missing-File+Param.py
  30. +1 −1 qa/029-Post+Without-lenght.py
  31. +1 −1 qa/030-Post+urlencoded.py
  32. +1 −1 qa/031-Post+urlencoded2.py
  33. +1 −1 qa/032-DirIndex+Redir.py
  34. +1 −1 qa/033-DirIndex.py
  35. +1 −1 qa/034-DirIndex2.py
  36. +1 −1 qa/035-PHP-simple.py
  37. +1 −1 qa/036-DocumentRoot-common.py
  38. +1 −1 qa/037-PHP-post.py
  39. +1 −1 qa/038-PHP-get.py
  40. +1 −1 qa/039-Auth-Basic.py
  41. +1 −1 qa/040-Auth-Basic2.py
  42. +1 −1 qa/041-Auth-Basic3.py
  43. +1 −1 qa/042-Pipelining.py
  44. +1 −1 qa/043-Pipelining2.py
  45. +1 −1 qa/044-Home.py
  46. +1 −1 qa/045-Home2.py
  47. +1 −1 qa/046-Redir.py
  48. +1 −1 qa/047-Redir2.py
  49. +1 −1 qa/048-NN.py
  50. +1 −1 qa/049-NN-broken.py
  51. +1 −1 qa/050-HeadBody.py
  52. +1 −1 qa/051-10kRandom.py
  53. +1 −1 qa/052-50kRandom.py
  54. +1 −1 qa/053-100kRandom.py
  55. +1 −1 qa/054-ContentRange.py
  56. +1 −1 qa/055-ContentRange2.py
  57. +1 −1 qa/056-ContentRange3.py
  58. +1 −1 qa/057-ContentRange4.py
  59. +1 −1 qa/058-ContentRange-Double.py
  60. +1 −1 qa/059-ContentRange-Double2.py
  61. +1 −1 qa/060-BigPost.py
  62. +1 −1 qa/061-PAM.py
  63. +1 −1 qa/062-PAM2.py
  64. +1 −1 qa/063-DocumentRoot.py
  65. +1 −1 qa/064-DirectoryIndex.py
  66. +1 −1 qa/065-DirectoryIndex2.py
  67. +1 −1 qa/066-DirectoryIndex3.py
  68. +1 −1 qa/067-PathInfo.py
  69. +1 −1 qa/068-PathInfo2.py
  70. +1 −1 qa/069-PathInfo3.py
  71. +1 −1 qa/070-Inherit.py
  72. +1 −1 qa/071-Inherit2.py
  73. +1 −1 qa/072-Inherit3.py
  74. +1 −1 qa/073-Access.py
  75. +1 −1 qa/074-Access2.py
  76. +1 −1 qa/075-AccessRange.py
  77. +1 −1 qa/076-AccessRange2.py
  78. +1 −1 qa/077-AccessRange3.py
  79. +1 −1 qa/078-AccessAny.py
  80. +1 −1 qa/079-Extension.py
  81. +1 −1 qa/080-Extension2.py
  82. +1 −1 qa/081-DocumentRoot-Common-index.py
  83. +1 −1 qa/082-Auth-header.py
  84. +1 −1 qa/083-RedirParam.py
  85. +1 −1 qa/084-RedirParamShow.py
  86. +1 −1 qa/085-AuthUsers.py
  87. +1 −1 qa/086-AuthUsers2.py
  88. +1 −1 qa/087-Location.py
  89. +1 −1 qa/088-CGI-envs.py
  90. +1 −1 qa/089-gzip-encoding.py
  91. +1 −1 qa/090-Digest.py
  92. +2 −2 qa/091-Digest2.py
  93. +2 −2 qa/092-Digest3.py
  94. +1 −1 qa/093-InvalidLinks.py
  95. +1 −1 qa/094-URL-request.py
  96. +1 −1 qa/095-htpasswd-apache-md5.py
  97. +1 −1 qa/096-htpasswd-md5.py
  98. +1 −1 qa/097-htpasswd-sha1.py
  99. +1 −1 qa/098-htpasswd-crypt.py
  100. +1 −1 qa/099-htpasswd-plain.py
  101. +2 −2 qa/100-Digest-htdigest.py
  102. +1 −1 qa/101-HugePost.py
  103. +1 −1 qa/102-QueryString.py
  104. +1 −1 qa/103-ScriptName.py
  105. +1 −1 qa/104-ScriptAlias_PathInfo.py
  106. +1 −1 qa/105-If-Range.py
  107. +1 −1 qa/106-If-Range2.py
  108. +1 −1 qa/107-Priority1.py
  109. +1 −1 qa/108-Priority2.py
  110. +1 −1 qa/109-Priority3.py
  111. +1 −1 qa/110-Priority4.py
  112. +1 −1 qa/111-Compac.py
  113. +1 −1 qa/112-NiceError-CGI.py
  114. +1 −1 qa/113-HeaderFile.py
  115. +1 −1 qa/114-HeaderFile2.py
  116. +1 −1 qa/115-Respin.py
  117. +1 −1 qa/116-RequestTiny.py
  118. +1 −1 qa/117-DomainToDir.py
  119. +1 −1 qa/118-Request-redir.py
  120. +1 −1 qa/119-Dotdot2.py
  121. +1 −1 qa/120-Dotdot3.py
  122. +1 −1 qa/121-NoUserDir.py
  123. +1 −1 qa/122-Methods.py
  124. +1 −1 qa/123-ImplicitRedit.py
  125. +1 −1 qa/124-DomainToDir2.py
  126. +1 −1 qa/125-domain-redir1.py
  127. +1 −1 qa/126-SCGI.py
  128. +1 −1 qa/127-SCGI-Post.py
  129. +1 −1 qa/128-ValidMethod-common.py
  130. +1 −1 qa/129-Basic-EmptyPasswd.py
  131. +2 −2 qa/130-Digest-EmptyPasswd.py
  132. +1 −1 qa/131-ChangeUser-phpcgi.py
  133. +1 −1 qa/132-file-ContentType.py
  134. +1 −1 qa/133-If-None-Match.py
  135. +1 −1 qa/134-HTTP_headers.py
  136. +1 −1 qa/135-RedirParams.py
  137. +1 −1 qa/136-BadRange.py
  138. +1 −1 qa/137-Mime1.py
  139. +1 −1 qa/138-ChangeUser-cgi.py
  140. +1 −1 qa/139-domain-wildcards1.py
  141. +1 −1 qa/140-SCGI-EmptyVars.py
  142. +1 −1 qa/141-FastCGI-EmptyVars.py
  143. +1 −1 qa/142-SCGI-ExtraVars.py
  144. +1 −1 qa/143-ContentRange-NoIO.py
  145. +1 −1 qa/144-ContentRange2-NoIO.py
  146. +1 −1 qa/145-ContentRange3-NoIO.py
  147. +1 −1 qa/146-ContentRange4-NoIO.py
  148. +1 −1 qa/147-ContentRange-Double-NoIO.py
  149. +1 −1 qa/148-ContentRange-Double2-NoIO.py
  150. +1 −1 qa/149-Common-PathInfo.py
  151. +1 −1 qa/150-Common-No-PathInfo.py
  152. +1 −1 qa/151-SCGI-vars.py
  153. +1 −1 qa/152-SCGI-vars2.py
  154. +1 −1 qa/153-SCGI-vars-root.py
  155. +1 −1 qa/154-DirRedirection.py
  156. +1 −1 qa/155-DirRedirection2.py
  157. +1 −1 qa/156-Mime2.py
  158. +1 −1 qa/157-Dirlist-symlinks.py
  159. +1 −1 qa/158-RuleHeader1.py
  160. +1 −1 qa/159-RuleHeader2.py
  161. +1 −1 qa/160-RuleNot1.py
  162. +1 −1 qa/161-RuleNot2.py
  163. +1 −1 qa/162-RuleAnd1.py
  164. +1 −1 qa/163-RuleAnd2.py
  165. +1 −1 qa/164-RuleOr1.py
  166. +1 −1 qa/165-RuleOr2.py
  167. +1 −1 qa/166-xsendfile1.py
  168. +1 −1 qa/167-RuleGeoIP.py
  169. +1 −1 qa/168-Deflate-Encoding.py
  170. +1 −1 qa/169-Pipermail.py
  171. +1 −1 qa/170-Error-ContentLength.py
  172. +1 −1 qa/171-SCGI-Keepalive.py
  173. +1 −1 qa/172-Chunked-CGI.py
  174. +1 −1 qa/173-Chunked-SCGI.py
  175. +1 −1 qa/174-Respins-Limit.py
  176. +1 −1 qa/175-RedirectUrl.py
  177. +2 −2 qa/176-Digest-htdigest-2.py
  178. +2 −1 qa/base.py
  179. +1 −0 qa/help.py
  180. +5 −7 qa/run-tests.py
View
@@ -1,5 +1,10 @@
2008-10-14 Alvaro Lopez Ortega <alvaro@octality.com>
+ * qa/run-tests.py, qa/help.py, qa/*-*.py: Added a new -D
+ parameter. It stops right before executing a certain QA test. All
+ the QA tests needed a small fix in order to be able to access its
+ file name.
+
* qa/067-PathInfo.py: This test needs pathinfo processing.
2008-10-13 Alvaro Lopez Ortega <alvaro@octality.com>
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Basic"
self.expected_error = 200
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Missing Protocol"
self.expected_error = 400
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Unknown Method"
self.expected_error = 501
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Unknown Method + Missing Protocol"
self.expected_error = 501
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Unknown Method"
self.expected_error = 400
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Wrong Protocol"
self.expected_error = 505
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Missing Host"
self.expected_error = 400
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Broken request"
self.expected_error = 400
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Double dot"
self.request = "GET /whatever/../ HTTP/1.0\r\n"
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Slash+dot+slash"
self.expected_error = 200
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Header entry twice"
self.expected_error = 200
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Broken header entry"
self.expected_error = 200
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Broken header entry II"
self.expected_error = 200
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Broken header entry III"
self.expected_error = 200
View
@@ -9,7 +9,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "CGI Execution"
self.request = "GET /cgi-bin1/test HTTP/1.0\r\n"
View
@@ -9,7 +9,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "CGI with pathinfo"
self.request = "GET /cgi-bin2/test/parameter HTTP/1.0\r\n"
View
@@ -10,7 +10,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "CGI with pathinfo II"
self.request = "GET /cgi-bin3/inside/test/test_parameter HTTP/1.0\r\n"
View
@@ -8,7 +8,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "CGI with pathinfo III"
self.request = "GET /cgi-bin4/inside/test/test_parameter HTTP/1.0\r\n"
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Head Method"
self.expected_error = 200
View
@@ -12,7 +12,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Virtual Host"
self.request = "GET /file HTTP/1.1\r\n" +\
"Connection: Close\r\n" + \
View
@@ -13,7 +13,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Virtual Host II"
self.request = "GET /file HTTP/1.1\r\n" +\
"Connection: Close\r\n" + \
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "HTTP 1.1 without Host"
self.expected_error = 400
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Host header"
self.expected_error = 200
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Host header with port"
self.expected_error = 200
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Broken Host header"
self.expected_error = 400
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Broken Host header II"
self.expected_error = 400
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Missing file"
self.expected_error = 404
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Missing file II"
self.expected_error = 404
@@ -9,7 +9,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Post request without length"
self.conf = CONF % (look_for_php())
@@ -9,7 +9,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Post with length zero"
self.conf = CONF
@@ -8,7 +8,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Post request"
self.expected_error = 200
View
@@ -2,7 +2,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Directory index redir"
self.expected_error = 301
View
@@ -10,7 +10,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Directory index, dirlist"
self.request = "GET /index1/ HTTP/1.0\r\n"
View
@@ -10,7 +10,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Directory index, common"
self.request = "GET /index2/ HTTP/1.0\r\n"
View
@@ -9,7 +9,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "PHP simple, phpcgi"
self.request = "GET /php1/simple.php HTTP/1.0\r\n"
self.conf = CONF % (look_for_php())
@@ -11,7 +11,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "DocumentRoot inside common"
self.request = "GET /dr_common/ HTTP/1.0\r\n"
self.expected_error = 200
View
@@ -4,7 +4,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "PHP post"
self.request = "POST /php3/post.php HTTP/1.0\r\n" +\
"Content-type: application/x-www-form-urlencoded\r\n" +\
View
@@ -4,7 +4,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "PHP get"
self.request = "GET /php4/get.php?this=1&magic=%s HTTP/1.0\r\n" % (MAGIC)
self.expected_error = 200
View
@@ -12,7 +12,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Auth basic"
self.request = "GET /auth1/ HTTP/1.0\r\n"
self.expected_error = 401
View
@@ -16,7 +16,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Auth basic II"
self.request = "GET /auth2/ HTTP/1.0\r\n" + \
"Authorization: Basic %s\r\n" % (encodestring ("%s:%s"%(LOGIN,PASSWD))[:-1])
View
@@ -12,7 +12,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Auth basic III"
self.request = "GET /auth3/ HTTP/1.0\r\n" + \
"Authorization: Basic WRONG_RpbjpvcGVuIHNlc2FtZQ==\r\n"
View
@@ -4,7 +4,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Pipelining"
self.request = "GET /pipe1/file1 HTTP/1.1\r\n" +\
View
@@ -5,7 +5,7 @@
class Test (TestBase):
def __init__ (self):
- TestBase.__init__ (self)
+ TestBase.__init__ (self, __file__)
self.name = "Pipelining, file and list"
self.request = "GET /pipe2/file1 HTTP/1.1\r\n" +\
Oops, something went wrong.

0 comments on commit bc8d926

Please sign in to comment.