summaryrefslogtreecommitdiff
path: root/repoze/bfg/tests
diff options
context:
space:
mode:
authorTres Seaver <tseaver@palladion.com>2010-03-03 19:53:39 +0000
committerTres Seaver <tseaver@palladion.com>2010-03-03 19:53:39 +0000
commita45898012f1c07d020ecaa2d629902e5eed5fe0d (patch)
tree763aa190b06a97a1227bac53e89e91b6397ec60a /repoze/bfg/tests
parentbdafcc9389c225d857026d12e58e3602fd0114ff (diff)
downloadpyramid-a45898012f1c07d020ecaa2d629902e5eed5fe0d.tar.gz
pyramid-a45898012f1c07d020ecaa2d629902e5eed5fe0d.tar.bz2
pyramid-a45898012f1c07d020ecaa2d629902e5eed5fe0d.zip
Defer conditional import of IPython to avoid breakage under mod_wsgi.
o http://bugs.repoze.org/issue138
Diffstat (limited to 'repoze/bfg/tests')
-rw-r--r--repoze/bfg/tests/test_paster.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/repoze/bfg/tests/test_paster.py b/repoze/bfg/tests/test_paster.py
index cabde215e..c2bbb12ad 100644
--- a/repoze/bfg/tests/test_paster.py
+++ b/repoze/bfg/tests/test_paster.py
@@ -20,7 +20,7 @@ class TestBFGShellCommand(unittest.TestCase):
class Options(object): pass
command.options = Options()
command.options.disable_ipython =True
- command.command()
+ command.command(IPShell=None)
self.assertEqual(loadapp.config_name, 'config:/foo/bar/myapp.ini')
self.assertEqual(loadapp.section_name, 'myapp')
self.failUnless(loadapp.relative_to)
@@ -38,12 +38,11 @@ class TestBFGShellCommand(unittest.TestCase):
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
dummy_shell_factory = DummyIPShellFactory()
- command.IPShell = dummy_shell_factory
command.args = ('/foo/bar/myapp.ini', 'myapp')
class Options(object): pass
command.options = Options()
command.options.disable_ipython = False
- command.command()
+ command.command(IPShell=dummy_shell_factory)
self.assertEqual(loadapp.config_name, 'config:/foo/bar/myapp.ini')
self.assertEqual(loadapp.section_name, 'myapp')
self.failUnless(loadapp.relative_to)