CPI
/
ordr2
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

cleanup after linting

rework
Holger Frey 7 years ago
parent
8f80a7ce37
commit
a21612cf0e
2 changed files with 17 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      ordr/tests/__init__.py
  2. 13
      ordr/tests/security.py

6
ordr/tests/__init__.py
Unescape View File

@ -60,9 +60,9 @@ def get_example_user(role):
user = User( user = User(
id=id_, id=id_,
username=first_name + last_name, username=first_name + last_name,
first_name = first_name, first_name=first_name,
last_name = last_name, last_name=last_name,
email = last_name.lower() + '@example.com', email=last_name.lower() + '@example.com',
role=role role=role
) )
user.set_password(first_name) user.set_password(first_name)

13
ordr/tests/security.py
Unescape View File

@ -2,7 +2,7 @@ import pytest
from pyramid.testing import DummyRequest from pyramid.testing import DummyRequest
from . import app_config, dbsession, get_example_user from . import app_config, dbsession, get_example_user # noqa: F401
def test_crypt_context_to_settings(): def test_crypt_context_to_settings():
@ -47,7 +47,7 @@ def test_authentication_policy_effective_principals_no_user():
assert result == [Everyone] assert result == [Everyone]
def test_authentication_policy_effective_principals_no_user(): def test_authentication_policy_effective_principals_with_user():
from ordr.security import AuthenticationPolicy from ordr.security import AuthenticationPolicy
from ordr.models import User, Role from ordr.models import User, Role
from pyramid.security import Authenticated, Everyone from pyramid.security import Authenticated, Everyone
@ -65,7 +65,7 @@ def test_authentication_policy_effective_principals_no_user():
assert result == expected assert result == expected
@pytest.mark.parametrize( @pytest.mark.parametrize( # noqa: F811
'uauid,role_name', [ 'uauid,role_name', [
(3, 'USER'), (3, 'USER'),
(4, 'PURCHASER'), (4, 'PURCHASER'),
@ -74,7 +74,7 @@ def test_authentication_policy_effective_principals_no_user():
) )
def test_get_user_returns_user(dbsession, uauid, role_name): def test_get_user_returns_user(dbsession, uauid, role_name):
from ordr.security import get_user from ordr.security import get_user
from ordr.models import User, Role from ordr.models import Role
# this is a dirty hack, but DummyRequest does not accept setting an # this is a dirty hack, but DummyRequest does not accept setting an
# unauthenticated_userid # unauthenticated_userid
from pyramid.testing import DummyResource from pyramid.testing import DummyResource
@ -86,8 +86,7 @@ def test_get_user_returns_user(dbsession, uauid, role_name):
assert get_user(request) == user assert get_user(request) == user
@pytest.mark.parametrize( # noqa: F811
@pytest.mark.parametrize(
'uauid,role_name', [ 'uauid,role_name', [
(1, 'UNVALIDATED'), (1, 'UNVALIDATED'),
(2, 'NEW'), (2, 'NEW'),
@ -98,7 +97,7 @@ def test_get_user_returns_user(dbsession, uauid, role_name):
) )
def test_get_user_returns_none(dbsession, uauid, role_name): def test_get_user_returns_none(dbsession, uauid, role_name):
from ordr.security import get_user from ordr.security import get_user
from ordr.models import User, Role from ordr.models import Role
# this is a dirty hack, but DummyRequest does not accept setting an # this is a dirty hack, but DummyRequest does not accept setting an
# unauthenticated_userid # unauthenticated_userid
from pyramid.testing import DummyResource from pyramid.testing import DummyResource