diff options
Diffstat (limited to 'tests/test_scripts')
| -rw-r--r-- | tests/test_scripts/dummy.py | 10 | ||||
| -rw-r--r-- | tests/test_scripts/test_proutes.py | 46 | ||||
| -rw-r--r-- | tests/test_scripts/test_ptweens.py | 3 | ||||
| -rw-r--r-- | tests/test_scripts/test_pviews.py | 26 |
4 files changed, 40 insertions, 45 deletions
diff --git a/tests/test_scripts/dummy.py b/tests/test_scripts/dummy.py index 69e69a280..8e340f645 100644 --- a/tests/test_scripts/dummy.py +++ b/tests/test_scripts/dummy.py @@ -1,3 +1,7 @@ +from zope.interface import implementer +from pyramid.interfaces import IMultiView + + class DummyTweens(object): def __init__(self, implicit, explicit): self._implicit = implicit @@ -87,14 +91,10 @@ class DummyView(object): def __init__(self, **attrs): self.__request_attrs__ = attrs - def view(context, request): + def view(context, request): # pragma: no cover pass -from zope.interface import implementer -from pyramid.interfaces import IMultiView - - @implementer(IMultiView) class DummyMultiView(object): def __init__(self, *views, **attrs): diff --git a/tests/test_scripts/test_proutes.py b/tests/test_scripts/test_proutes.py index 5bbfa9f25..5e3f359f6 100644 --- a/tests/test_scripts/test_proutes.py +++ b/tests/test_scripts/test_proutes.py @@ -121,7 +121,7 @@ class TestPRoutesCommand(unittest.TestCase): registry = self._makeRegistry() - def view(): + def view(): # pragma: no cover pass class IMyRoute(Interface): @@ -148,7 +148,7 @@ class TestPRoutesCommand(unittest.TestCase): registry = self._makeRegistry() - def view(): + def view(): # pragma: no cover pass class IMyRoute(Interface): @@ -181,7 +181,7 @@ class TestPRoutesCommand(unittest.TestCase): registry = self._makeRegistry() - def view(): + def view(): # pragma: no cover pass class IMyRoute(Interface): @@ -254,7 +254,7 @@ class TestPRoutesCommand(unittest.TestCase): registry = self._makeRegistry() - def view(): + def view(): # pragma: no cover pass class IMyRoot(Interface): @@ -269,7 +269,7 @@ class TestPRoutesCommand(unittest.TestCase): registry.registerUtility(IMyRoute, IRouteRequest, name='a') command = self._makeOne() - def factory(request): + def factory(request): # pragma: no cover pass route = dummy.DummyRoute('a', '/a', factory=factory) @@ -291,7 +291,7 @@ class TestPRoutesCommand(unittest.TestCase): registry = self._makeRegistry() - def view(): + def view(): # pragma: no cover pass class IMyRoute(Interface): @@ -334,7 +334,7 @@ class TestPRoutesCommand(unittest.TestCase): def test_one_route_all_methods_view_only_post(self): from pyramid.renderers import null_renderer as nr - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -362,7 +362,7 @@ class TestPRoutesCommand(unittest.TestCase): def test_one_route_only_post_view_all_methods(self): from pyramid.renderers import null_renderer as nr - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -388,7 +388,7 @@ class TestPRoutesCommand(unittest.TestCase): def test_one_route_only_post_view_post_and_get(self): from pyramid.renderers import null_renderer as nr - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -419,7 +419,7 @@ class TestPRoutesCommand(unittest.TestCase): def test_route_request_method_mismatch(self): from pyramid.renderers import null_renderer as nr - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -446,8 +446,6 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(compare_to, expected) def test_route_static_views(self): - from pyramid.renderers import null_renderer as nr - config = self._makeConfig(autocommit=True) config.add_static_view('static', 'static', cache_max_age=3600) path2 = os.path.normpath('/var/www/static') @@ -486,8 +484,6 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(data, expected[index]) def test_route_no_view(self): - from pyramid.renderers import null_renderer as nr - config = self._makeConfig(autocommit=True) config.add_route('foo', '/a/b', request_method='POST') @@ -507,7 +503,7 @@ class TestPRoutesCommand(unittest.TestCase): config1 = self._makeConfig(autocommit=True) - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config1.add_route('foo', '/a/b', request_method='POST') @@ -532,7 +528,7 @@ class TestPRoutesCommand(unittest.TestCase): from pyramid.renderers import null_renderer as nr from pyramid.config import not_ - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -564,7 +560,7 @@ class TestPRoutesCommand(unittest.TestCase): from pyramid.renderers import null_renderer as nr from pyramid.config import not_ - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -596,10 +592,10 @@ class TestPRoutesCommand(unittest.TestCase): from pyramid.renderers import null_renderer as nr from pyramid.config import not_ - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' - def view2(context, request): + def view2(context, request): # pragma: no cover return 'view2' config = self._makeConfig(autocommit=True) @@ -641,7 +637,7 @@ class TestPRoutesCommand(unittest.TestCase): from pyramid.renderers import null_renderer as nr from pyramid.config import not_ - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -672,7 +668,7 @@ class TestPRoutesCommand(unittest.TestCase): from pyramid.renderers import null_renderer as nr from pyramid.config import not_ - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -702,7 +698,7 @@ class TestPRoutesCommand(unittest.TestCase): from pyramid.renderers import null_renderer as nr from pyramid.config import not_ - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -736,7 +732,7 @@ class TestPRoutesCommand(unittest.TestCase): from pyramid.renderers import null_renderer as nr from pyramid.config import not_ - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -770,7 +766,7 @@ class TestPRoutesCommand(unittest.TestCase): from pyramid.renderers import null_renderer as nr from pyramid.config import not_ - def view1(context, request): + def view1(context, request): # pragma: no cover return 'view1' config = self._makeConfig(autocommit=True) @@ -801,8 +797,6 @@ class TestPRoutesCommand(unittest.TestCase): self.assertEqual(L[0].split(), ['Method', 'Name']) def test_static_routes_included_in_list(self): - from pyramid.renderers import null_renderer as nr - config = self._makeConfig(autocommit=True) config.add_route('foo', 'http://example.com/bar.aspx', static=True) diff --git a/tests/test_scripts/test_ptweens.py b/tests/test_scripts/test_ptweens.py index a7fe6f651..ee50887f6 100644 --- a/tests/test_scripts/test_ptweens.py +++ b/tests/test_scripts/test_ptweens.py @@ -48,7 +48,8 @@ class TestPTweensCommand(unittest.TestCase): self.assertEqual(result, 0) self.assertEqual( L[0], - '"pyramid.tweens" config value set (explicitly ordered tweens used)', + '"pyramid.tweens" config value set (explicitly ordered tweens ' + 'used)', ) def test__get_tweens(self): diff --git a/tests/test_scripts/test_pviews.py b/tests/test_scripts/test_pviews.py index cdb3c1c33..0b26a9cf3 100644 --- a/tests/test_scripts/test_pviews.py +++ b/tests/test_scripts/test_pviews.py @@ -75,7 +75,7 @@ class TestPViewsCommand(unittest.TestCase): registry = Registry() - def view1(): + def view1(): # pragma: no cover pass request = dummy.DummyRequest({'PATH_INFO': '/a'}) @@ -128,7 +128,7 @@ class TestPViewsCommand(unittest.TestCase): registry = Registry() - def view(): + def view(): # pragma: no cover pass class IMyRoot(Interface): @@ -167,10 +167,10 @@ class TestPViewsCommand(unittest.TestCase): registry = Registry() - def view1(): + def view1(): # pragma: no cover pass - def view2(): + def view2(): # pragma: no cover pass class IMyRoot(Interface): @@ -213,10 +213,10 @@ class TestPViewsCommand(unittest.TestCase): registry = Registry() - def view1(): + def view1(): # pragma: no cover pass - def view2(): + def view2(): # pragma: no cover pass class IMyRoot(Interface): @@ -259,7 +259,7 @@ class TestPViewsCommand(unittest.TestCase): def test__find_multi_routes_all_match(self): command = self._makeOne() - def factory(request): + def factory(request): # pragma: no cover pass routes = [ @@ -280,7 +280,7 @@ class TestPViewsCommand(unittest.TestCase): def test__find_multi_routes_some_match(self): command = self._makeOne() - def factory(request): + def factory(request): # pragma: no cover pass routes = [ @@ -295,7 +295,7 @@ class TestPViewsCommand(unittest.TestCase): def test__find_multi_routes_none_match(self): command = self._makeOne() - def factory(request): + def factory(request): # pragma: no cover pass routes = [ @@ -363,7 +363,7 @@ class TestPViewsCommand(unittest.TestCase): L = [] command.out = L.append - def view(): + def view(): # pragma: no cover pass view.__request_attrs__ = {'context': 'context', 'view_name': 'a'} @@ -405,7 +405,7 @@ class TestPViewsCommand(unittest.TestCase): L = [] command.out = L.append - def predicate(): + def predicate(): # pragma: no cover pass predicate.text = lambda *arg: "predicate = x" @@ -483,7 +483,7 @@ class TestPViewsCommand(unittest.TestCase): L = [] command.out = L.append - def predicate(): + def predicate(): # pragma: no cover pass predicate.text = lambda *arg: "predicate = x" @@ -563,7 +563,7 @@ class TestPViewsCommand(unittest.TestCase): L = [] command.out = L.append - def predicate(): + def predicate(): # pragma: no cover pass predicate.text = lambda *arg: "predicate = x" |