new/tests: revision information was removed in CKAN 2.9 (ckan/ckan#3972); tests pass

nickumia-reisys · nickumia-reisys · commit 5977431dad0c · 2021-08-31T14:33:40.000-04:00
diff --git a/ckanext/datagov_inventory/plugin.py b/ckanext/datagov_inventory/plugin.py
@@ -39,8 +39,6 @@ def get_auth_functions(self):
                 'organization_list': datagov_disallow_anonymous_access(),
                 'package_list': datagov_disallow_anonymous_access(),
                 'package_search': datagov_disallow_anonymous_access(),
-                'revision_list': datagov_disallow_anonymous_access(),
-                'revision_show': datagov_disallow_anonymous_access(),
                 'site_read': datagov_disallow_anonymous_access(),
                 'tag_list': datagov_disallow_anonymous_access(),
                 'tag_show': datagov_disallow_anonymous_access(),
diff --git a/ckanext/datagov_inventory/tests/logic/auth/test_auth.py b/ckanext/datagov_inventory/tests/logic/auth/test_auth.py
@@ -1,8 +1,9 @@
 """Tests for datagov_inventory plugin.py."""
 
-from nose.tools import assert_raises
+from builtins import object
+from pytest import raises as assert_raises
+import pytest
 
-from ckan.lib import search
 import ckan.logic as logic
 import ckan.model as model
 
@@ -19,22 +20,13 @@
 is_denied = False
 
 
+@pytest.mark.usefixtures(u"clean_index")
+@pytest.mark.usefixtures(u"clean_db")
 class TestDatagovInventoryAuth(object):
 
-    @classmethod
-    def setup_class(self):
-        '''Nose runs this method once to setup our test class.'''
-
     def setup(self):
-        '''Nose runs this method before each test method in our test class.'''
-
         # Start with a clean database and index for each test
-        search.clear_all()
         self.clean_datastore()
-        model.repo.rebuild_db()
-
-    def teardown(self):
-        '''Nose runs this method after each test method in our test class.'''
 
     def setup_test_orgs_users(self):
 
@@ -97,8 +89,8 @@ def factory_dataset(self, **kwargs):
         # Return id string for the package and resoruce just created
         return({'package_id': dataset['id'],
                 'tag_id': dataset_params['tag_string'],
-                'resource_id': dataset['resources'][0]['id'],
-                'revision_id': dataset['revision_id']})
+                'resource_id': dataset['resources'][0]['id']})
+        # 'revision_id': dataset['revision_id']})
 
     def assert_user_authorization(self,
                                   auth_function,
@@ -127,11 +119,10 @@ def assert_user_authorization(self,
                 assert actual_authorization == expected_user_access_dict[user]
             else:
                 # We expect users to be denied
-                assert_raises(logic.NotAuthorized,
-                              helpers.call_auth,
-                              auth_function,
-                              context=context,
-                              id=object_id)
+                with assert_raises(logic.NotAuthorized):
+                    helpers.call_auth(auth_function,
+                                      context=context,
+                                      id=object_id)
 
     def test_auth_format_autocomplete(self):
         # Create test users and test group
@@ -285,33 +276,6 @@ def test_auth_resource_show_for_public_gsa_dataset(self):
             'anonymous': is_allowed
         }, object_id=dataset['resource_id'])
 
-    def test_auth_revision_list(self):
-        # Create test users and test data
-        self.setup_test_orgs_users()
-
-        self.assert_user_authorization('revision_list', {
-            'gsa_admin': is_allowed,
-            'gsa_editor': is_allowed,
-            'gsa_member': is_allowed,
-            'doi_admin': is_allowed,
-            'doi_member': is_allowed,
-            'anonymous': is_denied
-        })
-
-    def test_auth_revision_show(self):
-        # Create test users and test data
-        self.setup_test_orgs_users()
-        dataset = self.factory_dataset(owner_org='gsa', private=True)
-
-        self.assert_user_authorization('revision_show', {
-            'gsa_admin': is_allowed,
-            'gsa_editor': is_allowed,
-            'gsa_member': is_allowed,
-            'doi_admin': is_allowed,
-            'doi_member': is_allowed,
-            'anonymous': is_denied
-        }, dataset['revision_id'])
-
     def test_auth_site_read(self):
         # Create test users and test data
         self.setup_test_orgs_users()
