From 385084582eeff5f2f1a93f3b90c091dc1a4ad50e Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 21 May 2009 02:47:43 +0000 Subject: Remove cacheability voodoo. --- repoze/bfg/tests/test_integration.py | 5 ++--- repoze/bfg/tests/test_view.py | 2 +- repoze/bfg/tests/test_zcml.py | 38 ++++++------------------------------ 3 files changed, 9 insertions(+), 36 deletions(-) (limited to 'repoze/bfg/tests') diff --git a/repoze/bfg/tests/test_integration.py b/repoze/bfg/tests/test_integration.py index fb07d76a5..8c088fce0 100644 --- a/repoze/bfg/tests/test_integration.py +++ b/repoze/bfg/tests/test_integration.py @@ -141,7 +141,7 @@ class TestGrokkedApp(unittest.TestCase): def tearDown(self): cleanUp() - def test_registry_actions_cannot_be_pickled_and_unpickled(self): + def test_it(self): import repoze.bfg.tests.grokkedapp as package from zope.configuration import config @@ -151,8 +151,7 @@ class TestGrokkedApp(unittest.TestCase): context.package = package xmlconfig.include(context, 'configure.zcml', package) actions = context.actions - import cPickle - self.assertRaises(cPickle.PicklingError, cPickle.dumps, actions, -1) + self.failUnless(actions) class DummyContext: pass diff --git a/repoze/bfg/tests/test_view.py b/repoze/bfg/tests/test_view.py index cb2336f2a..a96051226 100644 --- a/repoze/bfg/tests/test_view.py +++ b/repoze/bfg/tests/test_view.py @@ -457,7 +457,7 @@ class TestBFGViewDecorator(unittest.TestCase): self.assertEqual(wrapped.__permission__, None) self.assertEqual(wrapped.__for__, Interface) self.assertEqual(wrapped.__request_type__, IRequest) - self.assertEqual(wrapped.__grok_module__, foo.__module__) + self.assertEqual(wrapped.__module__, foo.__module__) self.assertEqual(wrapped.__name__, foo.__name__) self.assertEqual(wrapped.__doc__, foo.__doc__) for k, v in foo.__dict__.items(): diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py index 0a1103b26..c2703f7c1 100644 --- a/repoze/bfg/tests/test_zcml.py +++ b/repoze/bfg/tests/test_zcml.py @@ -48,7 +48,7 @@ class TestViewDirective(unittest.TestCase): self.assertEqual(permission['args'][5], None) regadapt = actions[1] - regadapt_discriminator = ('view', IFoo, '', IRequest, IView, True) + regadapt_discriminator = ('view', IFoo, '', IRequest, IView) self.assertEqual(regadapt['discriminator'], regadapt_discriminator) self.assertEqual(regadapt['callable'], handler) self.assertEqual(regadapt['args'][0], 'registerAdapter') @@ -87,32 +87,7 @@ class TestViewDirective(unittest.TestCase): self.assertEqual(permission['args'][5], None) regadapt = actions[1] - regadapt_discriminator = ('view', IFoo, '', IDummy, IView, True) - self.assertEqual(regadapt['discriminator'], regadapt_discriminator) - self.assertEqual(regadapt['callable'], handler) - self.assertEqual(regadapt['args'][0], 'registerAdapter') - self.assertEqual(regadapt['args'][1], view) - self.assertEqual(regadapt['args'][2], (IFoo, IDummy)) - self.assertEqual(regadapt['args'][3], IView) - self.assertEqual(regadapt['args'][4], '') - self.assertEqual(regadapt['args'][5], None) - - def test_uncacheable(self): - context = DummyContext() - class IFoo: - pass - view = lambda *arg: None - self._callFUT(context, 'repoze.view', IFoo, view=view, - request_type=IDummy, cacheable=False) - actions = context.actions - from repoze.bfg.interfaces import IView - from repoze.bfg.zcml import handler - from repoze.bfg.zcml import Uncacheable - - self.assertEqual(len(actions), 2) - - regadapt = actions[1] - regadapt_discriminator = ('view', IFoo, '', IDummy, IView, Uncacheable) + regadapt_discriminator = ('view', IFoo, '', IDummy, IView) self.assertEqual(regadapt['discriminator'], regadapt_discriminator) self.assertEqual(regadapt['callable'], handler) self.assertEqual(regadapt['args'][0], 'registerAdapter') @@ -146,7 +121,7 @@ class TestViewDirective(unittest.TestCase): self.assertEqual(len(actions), 1) regadapt = actions[0] - regadapt_discriminator = ('view', IFoo, '', IBar, IView, True) + regadapt_discriminator = ('view', IFoo, '', IBar, IView) self.assertEqual(regadapt['discriminator'], regadapt_discriminator) self.assertEqual(regadapt['callable'], handler) @@ -181,7 +156,7 @@ class TestViewDirective(unittest.TestCase): self.assertEqual(len(actions), 1) regadapt = actions[0] - regadapt_discriminator = ('view', IFoo, '', IBar, IView, True) + regadapt_discriminator = ('view', IFoo, '', IBar, IView) self.assertEqual(regadapt['discriminator'], regadapt_discriminator) self.assertEqual(regadapt['callable'], handler) @@ -217,7 +192,7 @@ class TestViewDirective(unittest.TestCase): self.assertEqual(len(actions), 1) regadapt = actions[0] - regadapt_discriminator = ('view', None, '', IRequest, IView, True) + regadapt_discriminator = ('view', None, '', IRequest, IView) self.assertEqual(regadapt['discriminator'], regadapt_discriminator) self.assertEqual(regadapt['callable'], handler) @@ -427,13 +402,12 @@ class TestRoute(unittest.TestCase): view_discriminator = view_action['discriminator'] view_args = view_action['args'] self.assertEqual(view_callable, handler) - self.assertEqual(len(view_discriminator), 6) + self.assertEqual(len(view_discriminator), 5) self.assertEqual(view_discriminator[0], 'view') self.assertEqual(view_discriminator[1], IRoutesContext) self.assertEqual(view_discriminator[2],'name') self.assertEqual(view_discriminator[3], IRequest) self.assertEqual(view_discriminator[4], IView) - self.assertEqual(view_discriminator[5], True) self.assertEqual(view_args, ('registerAdapter', view, (IRoutesContext, IRequest), IView, 'name', None)) -- cgit v1.2.3