[Checkins] SVN: zope.app.wsgi/trunk/ Merge branch janjaapdriessen-webtest.
Jan-Jaap Driessen
jdriessen at thehealthagency.com
Tue Mar 15 18:41:30 EDT 2011
Log message for revision 120960:
Merge branch janjaapdriessen-webtest.
Changed:
U zope.app.wsgi/trunk/bootstrap.py
U zope.app.wsgi/trunk/buildout.cfg
U zope.app.wsgi/trunk/setup.py
U zope.app.wsgi/trunk/src/zope/app/wsgi/testing.py
U zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.py
U zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.txt
-=-
Modified: zope.app.wsgi/trunk/bootstrap.py
===================================================================
--- zope.app.wsgi/trunk/bootstrap.py 2011-03-15 22:37:19 UTC (rev 120959)
+++ zope.app.wsgi/trunk/bootstrap.py 2011-03-15 22:41:30 UTC (rev 120960)
@@ -16,37 +16,245 @@
Simply run this script in a directory containing a buildout.cfg.
The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file.
-
-$Id$
"""
-import os, shutil, sys, tempfile, urllib2
+import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+from optparse import OptionParser
-tmpeggs = tempfile.mkdtemp()
+if sys.platform == 'win32':
+ def quote(c):
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ else:
+ return c
+else:
+ quote = str
-ez = {}
-exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
- ).read() in ez
-ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
+stdout, stderr = subprocess.Popen(
+ [sys.executable, '-Sc',
+ 'try:\n'
+ ' import ConfigParser\n'
+ 'except ImportError:\n'
+ ' print 1\n'
+ 'else:\n'
+ ' print 0\n'],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+has_broken_dash_S = bool(int(stdout.strip()))
-import pkg_resources
+# In order to be more robust in the face of system Pythons, we want to
+# run without site-packages loaded. This is somewhat tricky, in
+# particular because Python 2.6's distutils imports site, so starting
+# with the -S flag is not sufficient. However, we'll start with that:
+if not has_broken_dash_S and 'site' in sys.modules:
+ # We will restart with python -S.
+ args = sys.argv[:]
+ args[0:0] = [sys.executable, '-S']
+ args = map(quote, args)
+ os.execv(sys.executable, args)
+# Now we are running with -S. We'll get the clean sys.path, import site
+# because distutils will do it later, and then reset the path and clean
+# out any namespace packages from site-packages that might have been
+# loaded by .pth files.
+clean_path = sys.path[:]
+import site
+sys.path[:] = clean_path
+for k, v in sys.modules.items():
+ if k in ('setuptools', 'pkg_resources') or (
+ hasattr(v, '__path__') and
+ len(v.__path__)==1 and
+ not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+ # This is a namespace package. Remove it.
+ sys.modules.pop(k)
-cmd = 'from setuptools.command.easy_install import main; main()'
-if sys.platform == 'win32':
- cmd = '"%s"' % cmd # work around spawn lamosity on windows
+is_jython = sys.platform.startswith('java')
+setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
+distribute_source = 'http://python-distribute.org/distribute_setup.py'
+
+# parsing arguments
+def normalize_to_url(option, opt_str, value, parser):
+ if value:
+ if '://' not in value: # It doesn't smell like a URL.
+ value = 'file://%s' % (
+ urllib.pathname2url(
+ os.path.abspath(os.path.expanduser(value))),)
+ if opt_str == '--download-base' and not value.endswith('/'):
+ # Download base needs a trailing slash to make the world happy.
+ value += '/'
+ else:
+ value = None
+ name = opt_str[2:].replace('-', '_')
+ setattr(parser.values, name, value)
+
+usage = '''\
+[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
+
+Bootstraps a buildout-based project.
+
+Simply run this script in a directory containing a buildout.cfg, using the
+Python that you want bin/buildout to use.
+
+Note that by using --setup-source and --download-base to point to
+local resources, you can keep this script from going over the network.
+'''
+
+parser = OptionParser(usage=usage)
+parser.add_option("-v", "--version", dest="version",
+ help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+ action="store_true", dest="use_distribute", default=False,
+ help="Use Distribute rather than Setuptools.")
+parser.add_option("--setup-source", action="callback", dest="setup_source",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or file location for the setup file. "
+ "If you use Setuptools, this will default to " +
+ setuptools_source + "; if you use Distribute, this "
+ "will default to " + distribute_source +"."))
+parser.add_option("--download-base", action="callback", dest="download_base",
+ callback=normalize_to_url, nargs=1, type="string",
+ help=("Specify a URL or directory for downloading "
+ "zc.buildout and either Setuptools or Distribute. "
+ "Defaults to PyPI."))
+parser.add_option("--eggs",
+ help=("Specify a directory for storing eggs. Defaults to "
+ "a temporary directory that is deleted when the "
+ "bootstrap script completes."))
+parser.add_option("-t", "--accept-buildout-test-releases",
+ dest='accept_buildout_test_releases',
+ action="store_true", default=False,
+ help=("Normally, if you do not specify a --version, the "
+ "bootstrap script and buildout gets the newest "
+ "*final* versions of zc.buildout and its recipes and "
+ "extensions for you. If you use this flag, "
+ "bootstrap and buildout will get the newest releases "
+ "even if they are alphas or betas."))
+parser.add_option("-c", None, action="store", dest="config_file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.eggs:
+ eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
+else:
+ eggs_dir = tempfile.mkdtemp()
+
+if options.setup_source is None:
+ if options.use_distribute:
+ options.setup_source = distribute_source
+ else:
+ options.setup_source = setuptools_source
+
+if options.accept_buildout_test_releases:
+ args.append('buildout:accept-buildout-test-releases=true')
+args.append('bootstrap')
+
+try:
+ import pkg_resources
+ import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ if not hasattr(pkg_resources, '_distribute'):
+ raise ImportError
+except ImportError:
+ ez_code = urllib2.urlopen(
+ options.setup_source).read().replace('\r\n', '\n')
+ ez = {}
+ exec ez_code in ez
+ setup_args = dict(to_dir=eggs_dir, download_delay=0)
+ if options.download_base:
+ setup_args['download_base'] = options.download_base
+ if options.use_distribute:
+ setup_args['no_fake'] = True
+ ez['use_setuptools'](**setup_args)
+ if 'pkg_resources' in sys.modules:
+ reload(sys.modules['pkg_resources'])
+ import pkg_resources
+ # This does not (always?) update the default working set. We will
+ # do it.
+ for path in sys.path:
+ if path not in pkg_resources.working_set.entries:
+ pkg_resources.working_set.add_entry(path)
+
+cmd = [quote(sys.executable),
+ '-c',
+ quote('from setuptools.command.easy_install import main; main()'),
+ '-mqNxd',
+ quote(eggs_dir)]
+
+if not has_broken_dash_S:
+ cmd.insert(1, '-S')
+
+find_links = options.download_base
+if not find_links:
+ find_links = os.environ.get('bootstrap-testing-find-links')
+if find_links:
+ cmd.extend(['-f', quote(find_links)])
+
+if options.use_distribute:
+ setup_requirement = 'distribute'
+else:
+ setup_requirement = 'setuptools'
ws = pkg_resources.working_set
-assert os.spawnle(
- os.P_WAIT, sys.executable, sys.executable,
- '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
- dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ) == 0
+setup_requirement_path = ws.find(
+ pkg_resources.Requirement.parse(setup_requirement)).location
+env = dict(
+ os.environ,
+ PYTHONPATH=setup_requirement_path)
-ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+requirement = 'zc.buildout'
+version = options.version
+if version is None and not options.accept_buildout_test_releases:
+ # Figure out the most recent final version of zc.buildout.
+ import setuptools.package_index
+ _final_parts = '*final-', '*final'
+ def _final_version(parsed_version):
+ for part in parsed_version:
+ if (part[:1] == '*') and (part not in _final_parts):
+ return False
+ return True
+ index = setuptools.package_index.PackageIndex(
+ search_path=[setup_requirement_path])
+ if find_links:
+ index.add_find_links((find_links,))
+ req = pkg_resources.Requirement.parse(requirement)
+ if index.obtain(req) is not None:
+ best = []
+ bestv = None
+ for dist in index[req.project_name]:
+ distv = dist.parsed_version
+ if _final_version(distv):
+ if bestv is None or distv > bestv:
+ best = [dist]
+ bestv = distv
+ elif distv == bestv:
+ best.append(dist)
+ if best:
+ best.sort()
+ version = best[-1].version
+if version:
+ requirement = '=='.join((requirement, version))
+cmd.append(requirement)
+
+if is_jython:
+ import subprocess
+ exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+ exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+if exitcode != 0:
+ sys.stdout.flush()
+ sys.stderr.flush()
+ print ("An error occurred when trying to install zc.buildout. "
+ "Look above this message for any errors that "
+ "were output by easy_install.")
+ sys.exit(exitcode)
+
+ws.add_entry(eggs_dir)
+ws.require(requirement)
import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
-shutil.rmtree(tmpeggs)
+zc.buildout.buildout.main(args)
+if not options.eggs: # clean up temporary egg directory
+ shutil.rmtree(eggs_dir)
Modified: zope.app.wsgi/trunk/buildout.cfg
===================================================================
--- zope.app.wsgi/trunk/buildout.cfg 2011-03-15 22:37:19 UTC (rev 120959)
+++ zope.app.wsgi/trunk/buildout.cfg 2011-03-15 22:41:30 UTC (rev 120960)
@@ -1,7 +1,13 @@
[buildout]
-develop = .
+extends =
+ http://download.zope.org/zopetoolkit/index/1.1/zopeapp-versions.cfg
+ http://download.zope.org/zopetoolkit/index/1.1/ztk-versions.cfg
+develop = .
parts = test
[test]
recipe = zc.recipe.testrunner
eggs = zope.app.wsgi [test]
+
+[versions]
+zope.testbrowser = 4.0.0
Modified: zope.app.wsgi/trunk/setup.py
===================================================================
--- zope.app.wsgi/trunk/setup.py 2011-03-15 22:37:19 UTC (rev 120959)
+++ zope.app.wsgi/trunk/setup.py 2011-03-15 22:41:30 UTC (rev 120960)
@@ -57,8 +57,8 @@
]),
install_requires=[
'setuptools',
+ 'WebTest',
'ZConfig',
- 'wsgi_intercept',
'ZODB3',
'zope.app.appsetup >= 3.14',
'zope.processlifetime',
@@ -74,7 +74,7 @@
'zope.lifecycleevent',
'zope.session',
'zope.site',
- 'zope.testbrowser [wsgi] >= 3.11',
+ 'zope.testbrowser[wsgi] >= 4.0.0',
'zope.testing',
'zope.traversing',
],
Modified: zope.app.wsgi/trunk/src/zope/app/wsgi/testing.py
===================================================================
--- zope.app.wsgi/trunk/src/zope/app/wsgi/testing.py 2011-03-15 22:37:19 UTC (rev 120959)
+++ zope.app.wsgi/trunk/src/zope/app/wsgi/testing.py 2011-03-15 22:41:30 UTC (rev 120960)
@@ -54,6 +54,9 @@
</body>
</html>'''
+class ErrorRaisingView(FileView):
+ def __call__(self):
+ return 1/0
class SillyMiddleWare(object):
def __init__(self, application):
Modified: zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.py
===================================================================
--- zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.py 2011-03-15 22:37:19 UTC (rev 120959)
+++ zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.py 2011-03-15 22:41:30 UTC (rev 120960)
@@ -18,8 +18,8 @@
import transaction
from zope.app.appsetup.testlayer import ZODBLayer
from zope.app.wsgi import WSGIPublisherApplication
-import wsgi_intercept
import zope.testbrowser.wsgi
+from webtest import TestRequest
# BBB
from zope.testbrowser.wsgi import Browser
@@ -46,36 +46,12 @@
self.root_factory()._p_jar.sync()
-class HandleErrorsMiddleware(object):
- """This middleware makes the WSGI application compatible with the
- HTTPCaller behavior defined in zope.app.testing.functional:
- - It honors the X-zope-handle-errors header in order to support
- zope.testbrowser Browser handleErrors flag.
- """
-
- default_handle_errors = 'True'
-
- def __init__(self, app, wsgi_stack):
- self.app = app
- self.wsgi_stack = wsgi_stack
-
- def __call__(self, environ, start_response):
- # Handle debug mode
- handle_errors = environ.get(
- 'HTTP_X_ZOPE_HANDLE_ERRORS', self.default_handle_errors)
- self.app.handleErrors = handle_errors == 'True'
-
- for entry in self.wsgi_stack(environ, start_response):
- yield entry
-
-
class BrowserLayer(zope.testbrowser.wsgi.Layer, ZODBLayer):
"""This create a test layer with a test database and register a wsgi
application to use that test database.
- A wsgi_intercept handler is installed as well, so you can use a
- WSGI version of zope.testbrowser Browser instance to access the
- application.
+ You can use a WSGI version of zope.testbrowser Browser instance to access
+ the application.
"""
def setup_middleware(self, app):
@@ -90,8 +66,7 @@
# off of that in testSetUp()
fake_db = object()
self._application = WSGIPublisherApplication(fake_db)
- return HandleErrorsMiddleware(
- self._application,
+ return zope.testbrowser.wsgi.AuthorizationMiddleware(
TransactionMiddleware(
self.getRootFolder,
self.setup_middleware(self._application)))
@@ -114,80 +89,45 @@
zope.app.testing.functional.
"""
- def __init__(self, response_text):
- self.response_text = response_text
+ def __init__(self, response):
+ self.response = response
def getStatus(self):
- line = self.getStatusString()
- status, rest = line.split(' ', 1)
- return int(status)
+ return self.response.status_int
def getStatusString(self):
- status_line = self.response_text.split('\n', 1)[0]
- protocol, status_string = status_line.split(' ', 1)
- return status_string
+ return self.response.status
def getHeader(self, name, default=None):
- without_body = self.response_text.split('\n\n', 1)[0]
- headers_text = without_body.split('\n', 1)[1]
- headers = headers_text.split('\n')
- result = []
- for header in headers:
- header_name, header_value = header.split(': ', 1)
- if name == header_name:
- result.append(header_value)
- if not result:
- return default
- elif len(result) == 1:
- return result[0]
- else:
- return result
+ return self.response.headers.get(name, default)
def getHeaders(self):
- without_body = self.response_text.split('\n\n', 1)[0]
- headers_text = without_body.split('\n', 1)[1]
- headers = headers_text.split('\n')
- result = []
- for header in headers:
- header_name, header_value = header.split(':', 1)
- result.append((header_name, header_value))
- return result
+ return self.response.headerlist
def getBody(self):
- parts = self.response_text.split('\n\n', 1)
- if len(parts) < 2:
- return ''
- return parts[1]
+ return self.response.body
def getOutput(self):
- return self.response_text
+ parts = ['HTTP/1.0 ' + self.response.status]
+ parts += map('%s: %s'.__mod__, self.response.headerlist)
+ if self.response.body:
+ parts += ['', self.response.body]
+ return '\n'.join(parts)
__str__ = getOutput
-# XXX seems to only used by tests of zope.app.publication, maybe it should
-# be moved there
-def http(string, handle_errors=True):
- """This function behave like the HTTPCaller of
- zope.app.testing.functional.
- """
- key = ('localhost', 80)
- if key not in wsgi_intercept._wsgi_intercept:
+def http(string, handle_errors=True):
+ app = zope.testbrowser.wsgi.Layer.get_app()
+ if app is None:
raise NotInBrowserLayer(NotInBrowserLayer.__doc__)
- (app_fn, script_name) = wsgi_intercept._wsgi_intercept[key]
- app = app_fn()
+ request = TestRequest.from_file(StringIO(string))
+ request.environ['wsgi.handleErrors'] = handle_errors
+ response = request.get_response(app)
+ return FakeResponse(response)
- if not string.endswith('\n'):
- string += '\n'
- string += 'X-zope-handle-errors: %s\n' % handle_errors
- socket = wsgi_intercept.wsgi_fake_socket(app, 'localhost', 80, '')
- socket.sendall(string.lstrip())
- result = socket.makefile()
- return FakeResponse(result.getvalue())
-
-
class FakeSocket(object):
def __init__(self, data):
Modified: zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.txt
===================================================================
--- zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.txt 2011-03-15 22:37:19 UTC (rev 120959)
+++ zope.app.wsgi/trunk/src/zope/app/wsgi/testlayer.txt 2011-03-15 22:41:30 UTC (rev 120960)
@@ -10,6 +10,12 @@
... IndexView,
... checker.NamesChecker(['browserDefault', '__call__']),
... )
+ >>> from zope.app.wsgi.testing import ErrorRaisingView
+ >>> component.provideAdapter(ErrorRaisingView, name='error.html')
+ >>> checker.defineChecker(
+ ... ErrorRaisingView,
+ ... checker.NamesChecker(['browserDefault', '__call__']),
+ ... )
The `silly middleware` has injected information into the page:
@@ -25,6 +31,33 @@
</body>
</html>
+The default behavior of the browser is to handle errors::
+
+ >>> browser.open('http://localhost/error.html')
+ Traceback (most recent call last):
+ ...
+ HTTPError: HTTP Error 500: Internal Server Error
+
+One can set error handling behavior::
+
+ >>> browser.handleErrors = False
+ >>> browser.open('http://localhost/error.html')
+ Traceback (most recent call last):
+ ...
+ ZeroDivisionError: integer division or modulo by zero
+
+The http caller is more low level than the Browser.
+It exposes the same error handling parameter::
+
+ >>> from zope.app.wsgi.testlayer import http
+ >>> response = http('GET /error.html HTTP/1.1')
+ >>> response.getStatus() == 500
+ True
+ >>> http('GET /error.html HTTP/1.1', handle_errors=False)
+ Traceback (most recent call last):
+ ...
+ ZeroDivisionError: integer division or modulo by zero
+
Clean up:
>>> import zope.publisher.interfaces.browser
@@ -36,3 +69,11 @@
... zope.publisher.interfaces.browser.IBrowserPublisher,
... 'index.html',
... )
+ >>> checker.undefineChecker(ErrorRaisingView)
+ >>> component.provideAdapter(
+ ... None,
+ ... (interface.Interface,
+ ... zope.publisher.interfaces.browser.IBrowserRequest),
+ ... zope.publisher.interfaces.browser.IBrowserPublisher,
+ ... 'error.html',
+ ... )
More information about the checkins
mailing list