Permalink
Browse files

- Make test suite pass on Jython (requires PasteScript trunk, presuma…

…bly to

  be 1.7.4).
  • Loading branch information...
1 parent 34c5907 commit 85ee02b24caf0bf6b491b5ecf7ad84c29ca8c75c @mcdonc mcdonc committed Nov 18, 2010
Showing with 10 additions and 2 deletions.
  1. +3 −0 CHANGES.txt
  2. +7 −2 pyramid/tests/test_configuration.py
View
3 CHANGES.txt
@@ -12,6 +12,9 @@ Features
- Add a ``pyramid.request.Request.route_path`` API. This is a convenience
method of the request which calls ``pyramid.url.route_url``.
+- Make test suite pass on Jython (requires PasteScript trunk, presumably to
+ be 1.7.4).
+
Bug Fixes
---------
View
9 pyramid/tests/test_configuration.py
@@ -2940,6 +2940,7 @@ def test_add_renderer_dottedname_factory(self):
pyramid.tests)
def test_scan_integration(self):
+ import os
from zope.interface import alsoProvides
from pyramid.interfaces import IRequest
from pyramid.view import render_view_to_response
@@ -3011,8 +3012,12 @@ def test_scan_integration(self):
result = render_view_to_response(ctx, req, 'another_stacked_class2')
self.assertEqual(result, 'another_stacked_class')
- self.assertRaises(TypeError,
- render_view_to_response, ctx, req, 'basemethod')
+ if not os.name.startswith('java'):
+ # on Jython, a class without an __init__ apparently accepts
+ # any number of arguments without raising a TypeError.
+
+ self.assertRaises(TypeError,
+ render_view_to_response, ctx, req, 'basemethod')
result = render_view_to_response(ctx, req, 'method1')
self.assertEqual(result, 'method1')

0 comments on commit 85ee02b

Please sign in to comment.