Skip to content

Commit

Permalink
Updated paster tests to use the ini_file#section syntax.
Browse files Browse the repository at this point in the history
  • Loading branch information
mmerickel committed Jul 6, 2011
1 parent 828384c commit 7b1a206
Showing 1 changed file with 43 additions and 23 deletions.
66 changes: 43 additions & 23 deletions pyramid/tests/test_paster.py
Expand Up @@ -15,7 +15,7 @@ def test_command_ipshell_is_None_ipython_enabled(self):
loadapp = DummyLoadApp(app)
command.interact = (interact,)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
class Options(object): pass
command.options = Options()
command.options.disable_ipython = False
Expand All @@ -39,7 +39,7 @@ def test_command_ipshell_is_not_None_ipython_disabled(self):
loadapp = DummyLoadApp(app)
command.interact = (interact,)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
class Options(object): pass
command.options = Options()
command.options.disable_ipython = True
Expand All @@ -62,7 +62,7 @@ def test_command_ipython_enabled(self):
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
dummy_shell_factory = DummyIPShellFactory()
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
class Options(object): pass
command.options = Options()
command.options.disable_ipython = False
Expand Down Expand Up @@ -92,7 +92,7 @@ def get_app(*arg, **kw):
interact = DummyInteractor()
app = DummyApp()
command.interact = (interact,)
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
class Options(object): pass
command.options = Options()
command.options.disable_ipython =True
Expand Down Expand Up @@ -121,7 +121,7 @@ def get_root(app):
apps.append(app)
return root, lambda *arg: None
command.get_root =get_root
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
class Options(object): pass
command.options = Options()
command.options.disable_ipython =True
Expand Down Expand Up @@ -152,7 +152,7 @@ def test_no_routes(self):
app = DummyApp()
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L, [])
Expand All @@ -165,7 +165,7 @@ def test_no_mapper(self):
app = DummyApp()
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L, [])
Expand All @@ -180,7 +180,7 @@ def test_single_route_no_route_registered(self):
app = DummyApp()
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(len(L), 3)
Expand All @@ -205,7 +205,7 @@ class IMyRoute(Interface):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(len(L), 3)
Expand Down Expand Up @@ -235,7 +235,7 @@ class IMyRoute(Interface):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(len(L), 3)
Expand Down Expand Up @@ -268,7 +268,7 @@ def factory(request): pass
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp')
command.args = ('/foo/bar/myapp.ini#myapp')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(len(L), 3)
Expand Down Expand Up @@ -511,7 +511,7 @@ def test_views_command_not_found(self):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand All @@ -528,7 +528,7 @@ def test_views_command_not_found_url_starts_without_slash(self):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', 'a')
command.args = ('/foo/bar/myapp.ini#myapp', 'a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand All @@ -546,7 +546,7 @@ def test_views_command_single_view_traversal(self):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand All @@ -567,7 +567,7 @@ def view(): pass
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand All @@ -588,7 +588,7 @@ def test_views_command_single_view_traversal_with_permission(self):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand All @@ -612,7 +612,7 @@ def predicate(): pass
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand All @@ -635,7 +635,7 @@ def test_views_command_single_view_route(self):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand Down Expand Up @@ -665,7 +665,7 @@ def test_views_command_multi_view_nested(self):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand All @@ -690,7 +690,7 @@ def predicate(): pass
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand Down Expand Up @@ -719,7 +719,7 @@ def test_views_command_multiview(self):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand All @@ -743,7 +743,7 @@ def test_views_command_multiview_with_permission(self):
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand All @@ -770,7 +770,7 @@ def predicate(): pass
app.registry = registry
loadapp = DummyLoadApp(app)
command.loadapp = (loadapp,)
command.args = ('/foo/bar/myapp.ini', 'myapp', '/a')
command.args = ('/foo/bar/myapp.ini#myapp', '/a')
result = command.command()
self.assertEqual(result, None)
self.assertEqual(L[1], 'URL = /a')
Expand Down Expand Up @@ -798,6 +798,26 @@ def test_it(self):
self.assertEqual(loadapp.section_name, 'myapp')
self.assertEqual(loadapp.relative_to, os.getcwd())
self.assertEqual(result, app)

def test_it_with_hash(self):
import os
app = DummyApp()
loadapp = DummyLoadApp(app)
result = self._callFUT('/foo/bar/myapp.ini#myapp', None, loadapp)
self.assertEqual(loadapp.config_name, 'config:/foo/bar/myapp.ini')
self.assertEqual(loadapp.section_name, 'myapp')
self.assertEqual(loadapp.relative_to, os.getcwd())
self.assertEqual(result, app)

def test_it_with_hash_and_name_override(self):
import os
app = DummyApp()
loadapp = DummyLoadApp(app)
result = self._callFUT('/foo/bar/myapp.ini#myapp', 'yourapp', loadapp)
self.assertEqual(loadapp.config_name, 'config:/foo/bar/myapp.ini')
self.assertEqual(loadapp.section_name, 'yourapp')
self.assertEqual(loadapp.relative_to, os.getcwd())
self.assertEqual(result, app)



Expand Down

0 comments on commit 7b1a206

Please sign in to comment.