From d6e1970d466d299de0f472ca8ba76af8f899d862 Mon Sep 17 00:00:00 2001 From: John Glover Date: Wed, 20 Mar 2013 16:10:09 +0100 Subject: [PATCH] [#669] Tidy up imports --- ckan/tests/logic/test_member.py | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ckan/tests/logic/test_member.py b/ckan/tests/logic/test_member.py index b75b1154f0c..38d1d795ac1 100644 --- a/ckan/tests/logic/test_member.py +++ b/ckan/tests/logic/test_member.py @@ -1,8 +1,7 @@ from nose.tools import assert_raises +import ckan.model as model import ckan.logic as logic -from ckan import model -from ckan.logic import get_action -from ckan.lib.create_test_data import CreateTestData +import ckan.lib.create_test_data as create_test_data class TestMemberLogic(object): @@ -13,7 +12,7 @@ def setup_class(cls): cls.groupname = 'david' model.repo.new_revision() - CreateTestData.create() + create_test_data.CreateTestData.create() cls.pkgs = [model.Package.by_name('warandpeace'), model.Package.by_name('annakarenina')] @@ -33,7 +32,7 @@ def _build_context(self, obj, obj_type, capacity='public'): def _add_member(self, obj, obj_type, capacity): ctx, dd = self._build_context(obj, obj_type, capacity) - return get_action('member_create')(ctx, dd) + return logic.get_action('member_create')(ctx, dd) def test_member_add(self): res = self._add_member(self.pkgs[0].id, 'package', 'public') @@ -43,32 +42,32 @@ def test_member_list(self): self._add_member(self.pkgs[0].id, 'package', 'public') self._add_member(self.pkgs[1].id, 'package', 'public') ctx, dd = self._build_context('', 'package') - res = get_action('member_list')(ctx, dd) + res = logic.get_action('member_list')(ctx, dd) assert len(res) == 2, res assert (self.pkgs[0].id, 'package', 'public') in res assert (self.pkgs[1].id, 'package', 'public') in res ctx, dd = self._build_context('', 'user', 'admin') - res = get_action('member_list')(ctx, dd) + res = logic.get_action('member_list')(ctx, dd) assert len(res) == 0, res ctx, dd = self._build_context('', 'user', 'admin') dd['id'] = u'foo' - assert_raises(logic.NotFound, get_action('member_list'), ctx, dd) + assert_raises(logic.NotFound, logic.get_action('member_list'), ctx, dd) self._add_member(self.username, 'user', 'admin') ctx, dd = self._build_context('', 'user', 'admin') - res = get_action('member_list')(ctx, dd) + res = logic.get_action('member_list')(ctx, dd) assert len(res) == 1, res assert (self.username, 'user', 'Admin') in res def test_member_delete(self): self._add_member(self.username, 'user', 'admin') ctx, dd = self._build_context(self.username, 'user', 'admin') - res = get_action('member_list')(ctx, dd) + res = logic.get_action('member_list')(ctx, dd) assert len(res) == 1, res - get_action('member_delete')(ctx, dd) + logic.get_action('member_delete')(ctx, dd) - res = get_action('member_list')(ctx, dd) + res = logic.get_action('member_list')(ctx, dd) assert len(res) == 0, res