From 2aa86c1a5227a675d32c4ede06e0c031ae3edfad Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 25 Nov 2009 16:36:29 +0000 Subject: - Replace martian with something simpler. --- repoze/bfg/tests/test_zcml.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'repoze/bfg/tests/test_zcml.py') diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py index b9e70c0bd..34250bdde 100644 --- a/repoze/bfg/tests/test_zcml.py +++ b/repoze/bfg/tests/test_zcml.py @@ -601,23 +601,21 @@ class TestZCMLScanDirective(unittest.TestCase): def tearDown(self): testing.tearDown() - def _callFUT(self, context, package, martian): + def _callFUT(self, context, package): from repoze.bfg.zcml import scan - return scan(context, package, martian) + return scan(context, package) def test_it(self): - from repoze.bfg.configuration import BFGMultiGrokker - martian = DummyMartianModule() - module_grokker = DummyModuleGrokker() + from repoze.bfg.configuration import Configurator dummy_module = DummyModule() context = DummyContext() - self._callFUT(context, dummy_module, martian) - context.actions[-1]['callable']() - self.assertEqual(martian.name, 'dummy') - multi_grokker = martian.module_grokker.multi_grokker - self.assertEqual(multi_grokker.__class__, BFGMultiGrokker) - self.assertEqual(martian.info, context.info) - self.failUnless(martian.exclude_filter) + self._callFUT(context, dummy_module) + actions = context.actions + self.assertEqual(len(actions), 1) + action = actions[0] + self.assertEqual(action['callable'].im_func, Configurator.scan.im_func) + self.assertEqual(action['discriminator'], None) + self.assertEqual(action['args'], (dummy_module, None)) class DummyModule: __path__ = "foo" -- cgit v1.2.3