From d8c776df0ff6a194be696c95d921caf2084194c6 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 29 Oct 2009 02:49:16 +0000 Subject: - An incorrect ZCML conflict would be encountered when the ``request_param`` predicate attribute was used on the ZCML ``view`` directive if any two otherwise same-predicated views had the combination of a predicate value with an ``=`` sign and one without (e.g. ``a`` vs. ``a=123``). --- repoze/bfg/tests/test_zcml.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'repoze/bfg/tests') diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py index 49b8d8cd1..352a53e53 100644 --- a/repoze/bfg/tests/test_zcml.py +++ b/repoze/bfg/tests/test_zcml.py @@ -649,7 +649,7 @@ class TestViewDirective(unittest.TestCase): request.params = {} self.assertRaises(NotFound, wrapper, None, request) - def test_with_request_paramoval_true(self): + def test_with_request_param_val_true(self): from zope.component import getSiteManager from zope.interface import Interface from repoze.bfg.interfaces import IRequest @@ -665,8 +665,8 @@ class TestViewDirective(unittest.TestCase): actions = context.actions self.assertEqual(len(actions), 1) action = actions[0] - discrim = ('view', IFoo, '', IRequest, IView, None, 'abc', None, None, - None, False, None, None, None) + discrim = ('view', IFoo, '', IRequest, IView, None, 'abc=123', None, + None, None, False, None, None, None) self.assertEqual(action['discriminator'], discrim) register = action['callable'] register() @@ -692,8 +692,8 @@ class TestViewDirective(unittest.TestCase): actions = context.actions self.assertEqual(len(actions), 1) action = actions[0] - discrim = ('view', IFoo, '', IRequest, IView, None, 'abc', None, None, - None, False, None, None, None) + discrim = ('view', IFoo, '', IRequest, IView, None, 'abc=123', None, + None, None, False, None, None, None) self.assertEqual(action['discriminator'], discrim) register = action['callable'] register() -- cgit v1.2.3