diff --git a/ckan/migration/versions/079_resource_revision_index.py b/ckan/migration/versions/079_resource_revision_index.py index 92744533e4e..70d985bfce0 100644 --- a/ckan/migration/versions/079_resource_revision_index.py +++ b/ckan/migration/versions/079_resource_revision_index.py @@ -5,4 +5,3 @@ def upgrade(migrate_engine): ON resource_revision (continuity_id); ''' ) - diff --git a/ckan/tests/logic/action/test_delete.py b/ckan/tests/logic/action/test_delete.py index 60e0d00c6dd..37875c94a90 100644 --- a/ckan/tests/logic/action/test_delete.py +++ b/ckan/tests/logic/action/test_delete.py @@ -188,6 +188,7 @@ def test_group_no_longer_shows_its_purged_dataset(self): def test_purged_dataset_is_not_in_search_results(self): search.clear() dataset = factories.Dataset() + def get_search_results(): results = helpers.call_action('package_search', q=dataset['title'])['results'] @@ -222,9 +223,10 @@ def test_purged_dataset_leaves_no_trace_in_the_model(self): assert_equals(model.Session.query(model.PackageExtra).all(), []) # the only member left is for the user created in factories.Group() and # factories.Organization() - assert_equals([(m.table_name, m.group.name) - for m in model.Session.query(model.Member).join(model.Group)], - [('user', 'group1'), ('user', 'test_org_0')]) + assert_equals(sorted( + [(m.table_name, m.group.name) + for m in model.Session.query(model.Member).join(model.Group)]), + [('user', 'group1'), ('user', org['name'])]) # all the object revisions were purged too assert_equals(model.Session.query(model.PackageRevision).all(), [])