From 68b4eec4378487b6f4f3533afc2674264ee12234 Mon Sep 17 00:00:00 2001 From: Sergey Motornyuk Date: Fri, 27 Sep 2019 17:32:48 +0300 Subject: [PATCH] Merge more stateful tests --- ckan/tests/legacy/logic/test_auth.py | 8 ++++---- ckan/tests/legacy/logic/test_member.py | 10 +++++----- ckan/tests/legacy/models/test_package_relationships.py | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ckan/tests/legacy/logic/test_auth.py b/ckan/tests/legacy/logic/test_auth.py index 3a05d48a267..e8463d1920d 100644 --- a/ckan/tests/legacy/logic/test_auth.py +++ b/ckan/tests/legacy/logic/test_auth.py @@ -117,7 +117,7 @@ def test_01_create_users(self): self._call_api('user_create', user, 'random_key', 403) self._call_api('user_create', user, 'no_org', 403) - def test_02_create_orgs(self): + # def test_02_create_orgs(self): org = {'name': 'org_no_user'} self._call_api('organization_create', org, 'random_key', 403) self._call_api('organization_create', org, 'sysadmin') @@ -130,7 +130,7 @@ def test_02_create_orgs(self): org = {'name': 'org_should_not_be_created'} self._call_api('organization_create', org, 'org_admin', 403) - def test_03_create_dataset_no_org(self): + # def test_03_create_dataset_no_org(self): # no owner_org supplied dataset = {'name': 'admin_create_no_org'} @@ -139,7 +139,7 @@ def test_03_create_dataset_no_org(self): dataset = {'name': 'should_not_be_created'} self._call_api('package_create', dataset, 'no_org', 403) - def test_04_create_dataset_with_org(self): + # def test_04_create_dataset_with_org(self): org_with_user = self._call_api('organization_show', {'id': 'org_with_user'}, 'sysadmin') dataset = {'name': 'admin_create_with_user', @@ -154,7 +154,7 @@ def test_04_create_dataset_with_org(self): dataset = {'name': 'user_create_with_org', 'owner_org': org_with_user.json['result']['id']} - def test_05_add_users_to_org(self): + # def test_05_add_users_to_org(self): member = {'username': 'org_admin', 'role': 'admin', diff --git a/ckan/tests/legacy/logic/test_member.py b/ckan/tests/legacy/logic/test_member.py index 46628b252f0..240ef8c92d0 100644 --- a/ckan/tests/legacy/logic/test_member.py +++ b/ckan/tests/legacy/logic/test_member.py @@ -5,6 +5,7 @@ import ckan.lib.create_test_data as create_test_data import pytest + @pytest.mark.ckan_pytest class TestMemberLogic: def setup_method(self): @@ -15,7 +16,7 @@ def setup_method(self): self.group = model.Group.get('david') self.roger = model.Group.get('roger') self.pkgs = [model.Package.by_name('warandpeace'), - model.Package.by_name('annakarenina')] + model.Package.by_name('annakarenina')] # 'Tester' becomes an admin for the 'roger' group model.repo.new_revision() @@ -23,7 +24,6 @@ def setup_method(self): table_name='user', capacity='admin') model.repo.commit_and_remove() - def teardown_method(self): model.repo.rebuild_db() @@ -55,9 +55,9 @@ def test_member_create_with_child_group_permission(self): def test_member_create_raises_when_only_have_parent_group_permission(self): with pytest.raises(logic.NotAuthorized): self._member_create_group_hierarchy( - self.roger, # parent - self.group, # child - self.tester) + self.roger, # parent + self.group, # child + self.tester) def test_member_create_accepts_group_name_or_id(self): by_name = self._member_create_in_group(self.pkgs[0].id, 'package', diff --git a/ckan/tests/legacy/models/test_package_relationships.py b/ckan/tests/legacy/models/test_package_relationships.py index 2e31c59a9ee..80bb99e4ed2 100644 --- a/ckan/tests/legacy/models/test_package_relationships.py +++ b/ckan/tests/legacy/models/test_package_relationships.py @@ -220,7 +220,7 @@ def test_01_rels(self): self._check(rels, 'bart', 'child_of', 'homer') self._check(rels, 'bart', 'child_of', 'marge') - def test_02_deletion(self): + # def test_02_deletion(self): "delete bart is child of homer" rels = model.Package.by_name(u'bart').get_relationships() assert len(rels) == 2 @@ -242,7 +242,7 @@ def test_02_deletion(self): q = q.filter_by(state=model.State.ACTIVE) assert q.count() == 0 - def test_03_recreate(self): + # def test_03_recreate(self): "recreate bart is child of homer" bart = model.Package.by_name(u"bart") homer = model.Package.by_name(u"homer") @@ -267,7 +267,7 @@ def test_03_recreate(self): deleted = q.filter_by(state=model.State.DELETED).count() assert deleted == 0, "bart has %d deleted relationships, expect 0" % deleted - def test_04_relationship_display(self): + # def test_04_relationship_display(self): bart = model.Package.by_name(u"bart") assert len(bart.get_relationships_printable()) == 3, len(bart.get_relationships_printable()) @@ -280,7 +280,7 @@ def test_04_relationship_display(self): bart = model.Package.by_name(u"bart") assert len(bart.get_relationships_printable()) == 2, len(bart.get_relationships_printable()) - def test_05_revers_recreation(self): + # def test_05_revers_recreation(self): homer = model.Package.by_name(u"homer") homer_derived = model.Package.by_name(u"homer_derived") rels = homer.get_relationships(with_package=homer_derived)