diff options
| author | Michael Merickel <michael@merickel.org> | 2018-10-14 23:16:48 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2018-10-14 23:46:11 -0500 |
| commit | dd3cc81f75dcb5ff96e0751653071722a15f46c2 (patch) | |
| tree | 7cfd6140211a21dedd2ddfeb4aa77b7ff4339fa9 /tests/pkgs | |
| parent | eadaee315eb142d1537d617da58343e3d7f1df0a (diff) | |
| download | pyramid-dd3cc81f75dcb5ff96e0751653071722a15f46c2.tar.gz pyramid-dd3cc81f75dcb5ff96e0751653071722a15f46c2.tar.bz2 pyramid-dd3cc81f75dcb5ff96e0751653071722a15f46c2.zip | |
fix the tests to import from the tests package instead of pyramid.tests
Diffstat (limited to 'tests/pkgs')
| -rw-r--r-- | tests/pkgs/conflictapp/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/defpermbugapp/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/eventonly/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/forbiddenview/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/includeapp1/root.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/includeapp1/three.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/includeapp1/two.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/notfoundview/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/static_assetspec/__init__.py | 2 | ||||
| -rw-r--r-- | tests/pkgs/static_routeprefix/__init__.py | 4 | ||||
| -rw-r--r-- | tests/pkgs/staticpermapp/__init__.py | 6 | ||||
| -rw-r--r-- | tests/pkgs/viewdecoratorapp/__init__.py | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/tests/pkgs/conflictapp/__init__.py b/tests/pkgs/conflictapp/__init__.py index 38116ab2f..d85aa0e1e 100644 --- a/tests/pkgs/conflictapp/__init__.py +++ b/tests/pkgs/conflictapp/__init__.py @@ -21,4 +21,4 @@ def includeme(config): config.set_authentication_policy(AuthTktAuthenticationPolicy( 'seekri1t', hashalg='sha512')) config.set_authorization_policy(ACLAuthorizationPolicy()) - config.include('pyramid.tests.pkgs.conflictapp.included') + config.include('tests.pkgs.conflictapp.included') diff --git a/tests/pkgs/defpermbugapp/__init__.py b/tests/pkgs/defpermbugapp/__init__.py index 032e8c626..3e59aa623 100644 --- a/tests/pkgs/defpermbugapp/__init__.py +++ b/tests/pkgs/defpermbugapp/__init__.py @@ -19,7 +19,7 @@ def includeme(config): from pyramid.authentication import AuthTktAuthenticationPolicy authn_policy = AuthTktAuthenticationPolicy('seekt1t', hashalg='sha512') authz_policy = ACLAuthorizationPolicy() - config.scan('pyramid.tests.pkgs.defpermbugapp') + config.scan('tests.pkgs.defpermbugapp') config._set_authentication_policy(authn_policy) config._set_authorization_policy(authz_policy) config.set_default_permission('private') diff --git a/tests/pkgs/eventonly/__init__.py b/tests/pkgs/eventonly/__init__.py index 7ae93ada6..452ae35a7 100644 --- a/tests/pkgs/eventonly/__init__.py +++ b/tests/pkgs/eventonly/__init__.py @@ -60,5 +60,5 @@ def sendfoobar(request): def includeme(config): config.add_subscriber_predicate('yup', Yup) - config.scan('pyramid.tests.pkgs.eventonly') + config.scan('tests.pkgs.eventonly') diff --git a/tests/pkgs/forbiddenview/__init__.py b/tests/pkgs/forbiddenview/__init__.py index 45fb8380b..6b4c3c116 100644 --- a/tests/pkgs/forbiddenview/__init__.py +++ b/tests/pkgs/forbiddenview/__init__.py @@ -27,5 +27,5 @@ def includeme(config): config.set_default_permission('a') config.add_route('foo', '/foo') config.add_route('bar', '/bar') - config.scan('pyramid.tests.pkgs.forbiddenview') + config.scan('tests.pkgs.forbiddenview') diff --git a/tests/pkgs/includeapp1/root.py b/tests/pkgs/includeapp1/root.py index f56203cfa..986356d81 100644 --- a/tests/pkgs/includeapp1/root.py +++ b/tests/pkgs/includeapp1/root.py @@ -5,6 +5,6 @@ def aview(request): def configure(config): config.add_view(aview) - config.include('pyramid.tests.pkgs.includeapp1.two.configure') + config.include('tests.pkgs.includeapp1.two.configure') config.commit() diff --git a/tests/pkgs/includeapp1/three.py b/tests/pkgs/includeapp1/three.py index e7131bcf5..973f91d99 100644 --- a/tests/pkgs/includeapp1/three.py +++ b/tests/pkgs/includeapp1/three.py @@ -5,6 +5,6 @@ def aview(request): def configure(config): config.add_view(aview, name='three') - config.include('pyramid.tests.pkgs.includeapp1.two.configure') # should not cycle + config.include('tests.pkgs.includeapp1.two.configure') # should not cycle config.add_view(aview) # will be overridden by root when resolved diff --git a/tests/pkgs/includeapp1/two.py b/tests/pkgs/includeapp1/two.py index 99b0f883a..6b8bb5539 100644 --- a/tests/pkgs/includeapp1/two.py +++ b/tests/pkgs/includeapp1/two.py @@ -5,5 +5,5 @@ def aview(request): def configure(config): config.add_view(aview, name='two') - config.include('pyramid.tests.pkgs.includeapp1.three.configure') + config.include('tests.pkgs.includeapp1.three.configure') config.add_view(aview) # will be overridden by root when resolved diff --git a/tests/pkgs/notfoundview/__init__.py b/tests/pkgs/notfoundview/__init__.py index ae148ea8c..8ba3ff9ed 100644 --- a/tests/pkgs/notfoundview/__init__.py +++ b/tests/pkgs/notfoundview/__init__.py @@ -26,5 +26,5 @@ def includeme(config): config.add_route('foo2', '/foo/') config.add_route('bar', '/bar/') config.add_route('baz', '/baz') - config.scan('pyramid.tests.pkgs.notfoundview') + config.scan('tests.pkgs.notfoundview') diff --git a/tests/pkgs/static_assetspec/__init__.py b/tests/pkgs/static_assetspec/__init__.py index cd6195397..dcb438aff 100644 --- a/tests/pkgs/static_assetspec/__init__.py +++ b/tests/pkgs/static_assetspec/__init__.py @@ -1,3 +1,3 @@ def includeme(config): - config.add_static_view('/', 'pyramid.tests:fixtures') + config.add_static_view('/', 'tests:fixtures') diff --git a/tests/pkgs/static_routeprefix/__init__.py b/tests/pkgs/static_routeprefix/__init__.py index 9b539380a..6a3a80712 100644 --- a/tests/pkgs/static_routeprefix/__init__.py +++ b/tests/pkgs/static_routeprefix/__init__.py @@ -1,7 +1,7 @@ def includeme(config): - config.add_static_view('/static', 'pyramid.tests:fixtures') + config.add_static_view('/static', 'tests:fixtures') config.include(includeme2, route_prefix='/prefix') def includeme2(config): - config.add_static_view('/static', 'pyramid.tests:fixtures/static') + config.add_static_view('/static', 'tests:fixtures/static') diff --git a/tests/pkgs/staticpermapp/__init__.py b/tests/pkgs/staticpermapp/__init__.py index cc690d937..b5038260f 100644 --- a/tests/pkgs/staticpermapp/__init__.py +++ b/tests/pkgs/staticpermapp/__init__.py @@ -16,10 +16,10 @@ def includeme(config): authz_policy = ACLAuthorizationPolicy() config._set_authentication_policy(authn_policy) config._set_authorization_policy(authz_policy) - config.add_static_view('allowed', 'pyramid.tests:fixtures/static/') - config.add_static_view('protected', 'pyramid.tests:fixtures/static/', + config.add_static_view('allowed', 'tests:fixtures/static/') + config.add_static_view('protected', 'tests:fixtures/static/', permission='view') config.add_static_view('factory_protected', - 'pyramid.tests:fixtures/static/', + 'tests:fixtures/static/', permission='view', factory=LocalRootFactory) diff --git a/tests/pkgs/viewdecoratorapp/__init__.py b/tests/pkgs/viewdecoratorapp/__init__.py index 5fa98062a..099bd29d5 100644 --- a/tests/pkgs/viewdecoratorapp/__init__.py +++ b/tests/pkgs/viewdecoratorapp/__init__.py @@ -1,3 +1,3 @@ def includeme(config): - config.scan('pyramid.tests.pkgs.viewdecoratorapp') + config.scan('tests.pkgs.viewdecoratorapp') |
