Skip to content

Commit

Permalink
[#1505] PEP8
Browse files Browse the repository at this point in the history
  • Loading branch information
vitorbaptista authored and amercader committed Jun 19, 2014
1 parent 9f80c0f commit 599463c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
3 changes: 2 additions & 1 deletion ckan/new_tests/factories.py
Expand Up @@ -117,7 +117,8 @@ class Group(factory.Factory):
# Generate a different group name param for each user that gets created.
name = factory.Sequence(lambda n: 'test_group_{n}'.format(n=n))

user = factory.LazyAttribute(lambda _: helpers.call_action('get_site_user'))
user = factory.LazyAttribute(lambda _:
helpers.call_action('get_site_user'))

@classmethod
def _build(cls, target_class, *args, **kwargs):
Expand Down
8 changes: 5 additions & 3 deletions ckan/new_tests/logic/action/test_create.py
Expand Up @@ -52,8 +52,9 @@ def test_user_invite_sends_invite(self, send_invite):

@mock.patch('ckan.lib.mailer.send_invite')
@mock.patch('random.SystemRandom')
def test_user_invite_works_even_if_tried_username_already_exists(self, SystemRandom, _):
SystemRandom.return_value.random.side_effect = [1000, 1000, 1000, 2000, 3000, 4000, 5000]
def test_user_invite_works_even_if_username_already_exists(self, rand, _):
rand.return_value.random.side_effect = [1000, 1000, 1000, 2000,
3000, 4000, 5000]

for _ in range(3):
invited_user = self._invite_user_to_group(email='same@email.com')
Expand All @@ -74,7 +75,8 @@ def test_user_invite_requires_role(self, _):
def test_user_invite_requires_group_id(self, _):
self._invite_user_to_group(group={'id': None})

def _invite_user_to_group(self, email='user@email.com', group=None, role='member'):
def _invite_user_to_group(self, email='user@email.com',
group=None, role='member'):
user = factories.User()
group = group or factories.Group(user=user)

Expand Down
5 changes: 3 additions & 2 deletions ckan/new_tests/logic/auth/test_create.py
Expand Up @@ -9,11 +9,12 @@


class TestCreate(object):

def setup(self):
helpers.reset_db()

@mock.patch('ckan.logic.auth.create.group_member_create')
def test_user_invite_prepares_data_dict_and_delegates_to_group_member_create(self, group_member_create):
def test_user_invite_delegates_correctly_to_group_member_create(self, gmc):
user = factories.User()
context = {
'user': user['name'],
Expand All @@ -26,4 +27,4 @@ def test_user_invite_prepares_data_dict_and_delegates_to_group_member_create(sel

helpers.call_auth('user_invite', context=context, **data_dict)

group_member_create.assert_called_with(context, group_member_create_data_dict)
gmc.assert_called_with(context, group_member_create_data_dict)

0 comments on commit 599463c

Please sign in to comment.