[Checkins] SVN: z3c.dav/trunk/src/z3c/dav/ Make tests run on the
latest publisher egg.
Michael Kerrin
michael.kerrin at openapp.ie
Tue Jun 26 13:24:39 EDT 2007
Log message for revision 77107:
Make tests run on the latest publisher egg.
Changed:
U z3c.dav/trunk/src/z3c/dav/ftests/test_propfind.py
U z3c.dav/trunk/src/z3c/dav/ftests/test_proppatch.py
U z3c.dav/trunk/src/z3c/dav/tests/test_propfind.py
U z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py
U z3c.dav/trunk/src/z3c/dav/utils.py
-=-
Modified: z3c.dav/trunk/src/z3c/dav/ftests/test_propfind.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/ftests/test_propfind.py 2007-06-26 17:23:09 UTC (rev 77106)
+++ z3c.dav/trunk/src/z3c/dav/ftests/test_propfind.py 2007-06-26 17:24:39 UTC (rev 77107)
@@ -85,7 +85,7 @@
<prop>
<resourcetype><collection /></resourcetype>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -111,7 +111,7 @@
<ns1:exampleintprop xmlns:ns1="DAVtest:" />
<ns1:unauthprop xmlns:ns1="DAVtest:" />
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -134,7 +134,7 @@
<resourcetype><collection /></resourcetype>
<ns1:exampleintprop xmlns:ns1="DAVtest:">0</ns1:exampleintprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -208,7 +208,7 @@
self.assertEqual(len(propstats), 1)
statusresp = response.findall("{DAV:}propstat/{DAV:}status")
self.assertEqual(len(statusresp), 1)
- self.assertEqual(statusresp[0].text, "HTTP/1.1 200 OK")
+ self.assertEqual(statusresp[0].text, "HTTP/1.1 200 Ok")
hrefs = response.findall("{DAV:}href")
self.assertEqual(len(hrefs), 1)
allhrefs.append(hrefs[0].text)
@@ -240,7 +240,7 @@
self.assertEqual(len(propstats), 1)
statusresp = response.findall("{DAV:}propstat/{DAV:}status")
self.assertEqual(len(statusresp), 1)
- self.assertEqual(statusresp[0].text, "HTTP/1.1 200 OK")
+ self.assertEqual(statusresp[0].text, "HTTP/1.1 200 Ok")
hrefs = response.findall("{DAV:}href")
self.assertEqual(len(hrefs), 1)
allhrefs.append(hrefs[0].text)
@@ -278,7 +278,7 @@
<resourcetype><collection /></resourcetype>
<ns1:testdeadprop xmlns:ns1="examplens:">TEST</ns1:testdeadprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -310,7 +310,7 @@
<ns1:exampleintprop xmlns:ns1="DAVtest:">0</ns1:exampleintprop>
<ns1:testdeadprop xmlns:ns1="examplens:">TEST</ns1:testdeadprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -333,7 +333,7 @@
<prop>
<displayname>copyright \xc2\xa9 me</displayname>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -366,7 +366,7 @@
<ns1:deadprop xmlns:ns1="deadprop:">
This is a dead property.</ns1:deadprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -421,7 +421,7 @@
<resourcetype><collection /></resourcetype>
<ns1:exampleintprop xmlns:ns1="DAVtest:">0</ns1:exampleintprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -458,7 +458,7 @@
<resourcetype><collection /></resourcetype>
<ns1:exampleintprop xmlns:ns1="DAVtest:">0</ns1:exampleintprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
<propstat>
<prop>
Modified: z3c.dav/trunk/src/z3c/dav/ftests/test_proppatch.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/ftests/test_proppatch.py 2007-06-26 17:23:09 UTC (rev 77106)
+++ z3c.dav/trunk/src/z3c/dav/ftests/test_proppatch.py 2007-06-26 17:24:39 UTC (rev 77107)
@@ -92,7 +92,7 @@
<prop>
<displayname />
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -209,7 +209,7 @@
<prop>
<ns1:Author xmlns:ns1="http://ns.example.com/z39.50/" />
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -247,7 +247,7 @@
<ns1:prop2 xmlns:ns1="example:" />
<ns1:prop3 xmlns:ns1="example:" />
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -275,7 +275,7 @@
<prop>
<displayname />
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -332,7 +332,7 @@
<prop>
<ns1:deadprop xmlns:ns1="deadprop:" />
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
@@ -357,7 +357,7 @@
<prop>
<displayname />
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
</multistatus>""",
Modified: z3c.dav/trunk/src/z3c/dav/tests/test_propfind.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_propfind.py 2007-06-26 17:23:09 UTC (rev 77106)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_propfind.py 2007-06-26 17:24:39 UTC (rev 77107)
@@ -443,7 +443,7 @@
<ns1:exampleintprop xmlns:ns1="DAVtest:"/>
<ns1:unauthprop xmlns:ns1="DAVtest:"/>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat></ns0:response>""")
def test_renderSelected(self):
@@ -465,7 +465,7 @@
<ns01:exampletextprop xmlns:ns0="DAVtest:">some text</ns01:exampletextprop>
<ns01:exampleintprop xmlns:ns0="DAVtest:">10</ns01:exampleintprop>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat></ns0:response>""")
def test_renderSelected_notfound(self):
@@ -486,7 +486,7 @@
<ns0:prop xmlns:ns0="DAV:">
<ns01:exampletextprop xmlns:ns0="DAVtest:">some text</ns01:exampletextprop>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat>
<ns0:propstat xmlns:ns0="DAV:" xmlns:ns01="DAVtest:">
<ns0:prop xmlns:ns0="DAV:">
@@ -511,7 +511,7 @@
<ns0:resourcetype />
<ns01:exampleintprop xmlns:ns0="DAVtest:">10</ns01:exampleintprop>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat></ns0:response>""")
def test_renderAllProperties_withInclude(self):
@@ -533,7 +533,7 @@
<ns0:resourcetype />
<ns01:exampleintprop xmlns:ns0="DAVtest:">10</ns01:exampleintprop>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat></ns0:response>""")
def test_renderAllProperties_withRestrictedProp(self):
@@ -551,7 +551,7 @@
<ns0:resourcetype />
<ns01:exampleintprop xmlns:ns0="DAVtest:">10</ns01:exampleintprop>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat></ns0:response>""")
def test_renderAllProperties_withRestrictedProp_include(self):
@@ -574,7 +574,7 @@
<ns0:resourcetype />
<ns01:exampleintprop xmlns:ns0="DAVtest:">10</ns01:exampleintprop>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat></ns0:response>""")
def test_renderBrokenProperty(self):
@@ -626,7 +626,7 @@
<prop>
<ns1:exampletextprop xmlns:ns1="DAVtest:">some text</ns1:exampletextprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
<propstat>
<prop>
@@ -667,7 +667,7 @@
<resourcetype />
<ns1:exampleintprop xmlns:ns1="DAVtest:">10</ns1:exampleintprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>""", response)
@@ -702,7 +702,7 @@
<resourcetype />
<ns1:exampleintprop xmlns:ns1="DAVtest:">10</ns1:exampleintprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
<propstat>
<prop>
@@ -737,7 +737,7 @@
<resourcetype />
<ns1:exampleintprop xmlns:ns1="DAVtest:">10</ns1:exampleintprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
<propstat>
<prop>
@@ -821,7 +821,7 @@
<ns0:collection xmlns:ns0="DAV:"/>
</ns0:resourcetype>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat>
</ns0:response>
<ns0:response xmlns:ns0="DAV:">
@@ -832,7 +832,7 @@
<ns0:collection xmlns:ns0="DAV:"/>
</ns0:resourcetype>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat>
</ns0:response>
<ns0:response xmlns:ns0="DAV:" xmlns:ns01="DAVtest:">
@@ -843,7 +843,7 @@
<ns0:resourcetype xmlns:ns0="DAV:"/>
<ns01:exampleintprop xmlns:ns0="DAVtest:">4</ns01:exampleintprop>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat>
</ns0:response>
<ns0:response xmlns:ns0="DAV:" xmlns:ns01="DAVtest:">
@@ -854,7 +854,7 @@
<ns0:resourcetype xmlns:ns0="DAV:"/>
<ns01:exampleintprop xmlns:ns0="DAVtest:">2</ns01:exampleintprop>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat>
</ns0:response></ns0:multistatus>
""")
Modified: z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py 2007-06-26 17:23:09 UTC (rev 77106)
+++ z3c.dav/trunk/src/z3c/dav/tests/test_proppatch.py 2007-06-26 17:24:39 UTC (rev 77107)
@@ -342,7 +342,7 @@
<ns0:getcontenttype xmlns:ns0="DAV:"/>
<ns0:displayname xmlns:ns0="DAV:"/>
</ns0:prop>
- <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 OK</ns0:status>
+ <ns0:status xmlns:ns0="DAV:">HTTP/1.1 200 Ok</ns0:status>
</ns0:propstat>
</ns0:response></ns0:multistatus>""")
Modified: z3c.dav/trunk/src/z3c/dav/utils.py
===================================================================
--- z3c.dav/trunk/src/z3c/dav/utils.py 2007-06-26 17:23:09 UTC (rev 77106)
+++ z3c.dav/trunk/src/z3c/dav/utils.py 2007-06-26 17:24:39 UTC (rev 77107)
@@ -163,10 +163,10 @@
def makestatuselement(status):
"""
>>> etree.tostring(makestatuselement(200)) #doctest:+XMLDATA
- '<status xmlns="DAV:">HTTP/1.1 200 OK</status>'
+ '<status xmlns="DAV:">HTTP/1.1 200 Ok</status>'
>>> etree.tostring(makestatuselement(200L)) #doctest:+XMLDATA
- '<status xmlns="DAV:">HTTP/1.1 200 OK</status>'
+ '<status xmlns="DAV:">HTTP/1.1 200 Ok</status>'
Do we want this?
@@ -214,7 +214,7 @@
<prop>
<testprop>Test Property</testprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
>>> pstat.properties.append(makedavelement(u'test2', u'Second Test'))
@@ -224,7 +224,7 @@
<testprop>Test Property</testprop>
<test2>Second Test</test2>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
>>> pstat.responsedescription = u'This is ok'
@@ -234,7 +234,7 @@
<testprop>Test Property</testprop>
<test2>Second Test</test2>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
<responsedescription>This is ok</responsedescription>
</propstat>
@@ -245,7 +245,7 @@
<testprop>Test Property</testprop>
<test2>Second Test</test2>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
<error>
<precondition-error />
</error>
@@ -320,7 +320,7 @@
<response xmlns="DAV:">
<href>/container</href>
<href>/container2</href>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</response>
The response XML element can contain a number of Propstat elements
@@ -343,7 +343,7 @@
<prop>
<test1>test one</test1>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
<propstat>
<prop>
@@ -361,7 +361,7 @@
<prop>
<test1>test one</test1>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
<propstat>
<prop>
@@ -382,7 +382,7 @@
<prop>
<test1>test one</test1>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
<propstat>
<prop>
@@ -404,7 +404,7 @@
<prop>
<test1>test one</test1>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
<propstat>
<prop>
@@ -448,7 +448,7 @@
<prop>
<testprop>Test Property</testprop>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
@@ -462,7 +462,7 @@
<testprop>Test Property</testprop>
<testprop2>Test Property Two</testprop2>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
@@ -475,7 +475,7 @@
<testprop>Test Property</testprop>
<testprop2>Test Property Two</testprop2>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
<propstat>
<prop>
@@ -583,7 +583,7 @@
<prop>
<test1>test one</test1>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
<responsedescription>simple description</responsedescription>
@@ -603,7 +603,7 @@
<prop>
<test1>test one</test1>
</prop>
- <status>HTTP/1.1 200 OK</status>
+ <status>HTTP/1.1 200 Ok</status>
</propstat>
</response>
<response>
More information about the Checkins
mailing list