[Checkins] SVN: grok/branches/sylvain-testlayers/src/grok/ftests/ Fix the remaining tests. The tests now work all against zope.app.wsgi.

[Martijn Faassen]

Log message for revision 111372:
  Fix the remaining tests. The tests now work all against zope.app.wsgi.
  

Changed:
  U   grok/branches/sylvain-testlayers/src/grok/ftests/rest/rest.py
  U   grok/branches/sylvain-testlayers/src/grok/ftests/xmlrpc/require.py
  U   grok/branches/sylvain-testlayers/src/grok/ftests/xmlrpc/xmlrpc.py

-=-
Modified: grok/branches/sylvain-testlayers/src/grok/ftests/rest/rest.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/rest/rest.py	2010-04-24 16:39:34 UTC (rev 111371)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/rest/rest.py	2010-04-24 16:40:06 UTC (rev 111372)
@@ -121,9 +121,9 @@
 
   >>> print http('POST /++rest++b/app HTTP/1.1')
   HTTP/1.0 405 Method Not Allowed
-  Allow: GET, PUT
   Content-Length: 18
   Content-Type: text/plain
+  Allow: GET, PUT
   <BLANKLINE>
   Method Not Allowed
 

Modified: grok/branches/sylvain-testlayers/src/grok/ftests/xmlrpc/require.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/xmlrpc/require.py	2010-04-24 16:39:34 UTC (rev 111371)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/xmlrpc/require.py	2010-04-24 16:40:06 UTC (rev 111372)
@@ -1,7 +1,7 @@
 """
-  >>> from zope.app.testing.xmlrpc import ServerProxy
-  >>> server = ServerProxy("http://localhost/")
-  >>> mgr_server = ServerProxy("http://mgr:mgrpw@localhost/")
+  >>> from zope.app.wsgi.testlayer import XMLRPCServerProxy
+  >>> server = XMLRPCServerProxy("http://localhost/")
+  >>> mgr_server = XMLRPCServerProxy("http://mgr:mgrpw@localhost/")
 
 We can access a public method just fine, but a protected method will
 raise Unauthorized:

Modified: grok/branches/sylvain-testlayers/src/grok/ftests/xmlrpc/xmlrpc.py
===================================================================
--- grok/branches/sylvain-testlayers/src/grok/ftests/xmlrpc/xmlrpc.py	2010-04-24 16:39:34 UTC (rev 111371)
+++ grok/branches/sylvain-testlayers/src/grok/ftests/xmlrpc/xmlrpc.py	2010-04-24 16:40:06 UTC (rev 111372)
@@ -1,8 +1,8 @@
 """
   >>> getRootFolder()["Manfred"] = Mammoth()
 
-  >>> from zope.app.testing.xmlrpc import ServerProxy
-  >>> server = ServerProxy("http://localhost/")
+  >>> from zope.app.wsgi.testlayer import XMLRPCServerProxy
+  >>> server = XMLRPCServerProxy("http://localhost/")
 
   >>> server.Manfred.stomp()
   'Manfred stomped.'