Code duplication from zope.app.wsgi in tests

[icemac]

The following code lines are mostly identical to zope.app.wsgi.testlayer:

zope.app.publisher/src/zope/app/publisher/xmlrpc/tests/__init__.py

Lines 28 to 92 in 5125d8c

	def http(query_str, *args, **kwargs):
	wsgi_app = AppPublisherLayer.make_wsgi_app()
	# Strip leading \n
	query_str = query_str.lstrip()
	kwargs.setdefault('handle_errors', True)
	if not isinstance(query_str, bytes):
	query_str = query_str.encode("utf-8")
	return _http(wsgi_app, query_str, *args, **kwargs)
	class ZopeTestTransport(xmlrpclib.Transport):
	"""xmlrpclib transport that delegates to
	zope.app.wsgi.testlayer.http
	It can be used like a normal transport, including support for basic
	authentication.
	"""
	verbose = False
	handleErrors = True
	def request(self, host, handler, request_body, verbose=0):
	request = "POST %s HTTP/1.0\n" % (handler,)
	request += "Content-Length: %i\n" % len(request_body)
	request += "Content-Type: text/xml\n"
	host, extra_headers, _x509 = self.get_host_info(host)
	if extra_headers:
	request += "Authorization: %s\n" % (
	dict(extra_headers)["Authorization"],)
	request += "\n"
	if isinstance(request_body, bytes) and str is not bytes:
	# Python 3
	request = request.encode("ascii")
	request += request_body
	response = http(request, handle_errors=self.handleErrors)
	errcode = response.getStatus()
	errmsg = response.getStatusString()
	# This is not the same way that the normal transport deals with the
	# headers.
	headers = response.getHeaders()
	assert errcode == 200
	body = response.getBody()
	if not isinstance(body, str):
	# Python 3
	body = body.decode("utf-8")
	content = 'HTTP/1.0 ' + errmsg + '\n\n' + body
	res = httplib.HTTPResponse(FakeSocket(content))
	res.begin()
	return self.parse_response(res)
	def ServerProxy(uri, transport=None, encoding=None,
	verbose=0, allow_none=0, handleErrors=True):
	"""A factory that creates a server proxy using the ZopeTestTransport
	by default.
	"""
	if transport is None:
	transport = ZopeTestTransport()
	if isinstance(transport, ZopeTestTransport):
	transport.handleErrors = handleErrors
	return xmlrpclib.ServerProxy(uri, transport, encoding, verbose, allow_none)

As zope.app.publisher already depends on zope.app.wsgi. The code there could be used here after zopefoundation/zope.app.wsgi#17 is fixed.

[icemac]

As zope.app.wsgi has no infrastructure to test the XMLRPC server proxy (zopefoundation/zope.app.wsgi#17 is there because the code is completely untested.) #8 suggests to generalize the code here and remove it from zope.app.wsgi.