fix: tests need to now be 'Pytest 5' compatiable

ckanext/validation/tests/fixtures.py

@@ -3,8 +3,6 @@
 from ckan.lib import uploader
 from ckanext.validation.model import create_tables, tables_exist
 
-import ckantoolkit as t
-
 
 @pytest.fixture
 def validation_setup():

ckanext/validation/tests/helpers.py

@@ -1,5 +1,4 @@
 import builtins
-import cgi
 import functools
 from unittest import mock
 from io import BytesIO
@@ -8,7 +7,6 @@
 from pyfakefs import fake_filesystem
 
 import ckan.lib.uploader
-from ckan.plugins import toolkit
 from ckan.tests.helpers import change_config
 
 
@@ -146,6 +144,7 @@ def wrapper(*args, **kwargs):
 class MockFieldStorage(FileStorage):
     pass
 
+
 def get_mock_file(contents):
     mock_file = BytesIO()
     mock_file.write(contents.encode('utf8'))

ckanext/validation/tests/test_form.py

@@ -1,14 +1,13 @@
 import json
 import io
-from unittest import mock
 import datetime
 
 import pytest
 
 import ckantoolkit as t
 from ckantoolkit.tests.factories import Sysadmin, Dataset
 from ckantoolkit.tests.helpers import (
-    call_action, _get_test_app
+    call_action
 )
 
 from ckanext.validation.tests.helpers import VALID_CSV, INVALID_CSV
@@ -255,8 +254,6 @@ def test_resource_form_update_upload(self, app):
         value = {"fields": [{"name": "code"}, {"name": "department"}, {"name": "date"}]}
         json_value = bytes(json.dumps(value).encode('utf8'))
 
-        upload = ('schema_upload', 'schema.json', json_value)
-
         data = {
             "url": "https://example.com/data.csv",
             "id": "",
@@ -451,7 +448,7 @@ def test_resource_form_update_invalid(self, app):
         user = Sysadmin()
         env = {"REMOTE_USER": user["name"].encode("ascii")}
 
-        dataset2 = call_action("package_show", id=dataset["id"])
+        call_action("package_show", id=dataset["id"])
         response = app.post(
             url=_edit_resource_url(dataset['id'], dataset['resources'][0]['id']),
             extra_environ=env,

ckanext/validation/tests/test_interfaces.py

@@ -4,8 +4,6 @@
 from ckan import plugins as p
 from ckan.tests import helpers, factories
 
-import ckantoolkit as t
-
 from ckanext.validation.interfaces import IDataValidation
 from ckanext.validation.tests.helpers import VALID_REPORT
 
@@ -40,14 +38,13 @@ def setup(self):
         for plugin in p.PluginImplementations(IDataValidation):
             return plugin.reset_counter()
 
+
 @pytest.fixture
 def reset_counter():
     for plugin in p.PluginImplementations(IDataValidation):
         return plugin.reset_counter()
 
 
-
-
 @pytest.mark.usefixtures("clean_db", "validation_setup", "with_plugins", "reset_counter")
 @pytest.mark.ckan_config("ckan.plugins", "validation test_validation_plugin scheming_datasets")
 class TestInterfaceSync():
@@ -130,6 +127,7 @@ def test_can_validate_called_on_update_sync_no_validation(self, mock_validation)
 
         assert not mock_validation.called
 
+
 @pytest.mark.usefixtures("clean_db", "validation_setup", "with_plugins", "reset_counter")
 @pytest.mark.ckan_config("ckan.plugins", "validation test_validation_plugin scheming_datasets")
 @pytest.mark.ckan_config('ckanext.validation.run_on_create_sync', False)

ckanext/validation/tests/test_jobs.py

@@ -9,7 +9,7 @@
 from ckan.tests.helpers import call_action
 from ckan.tests import factories
 
-from ckanext.validation.model import create_tables, tables_exist, Validation
+from ckanext.validation.model import Validation
 from ckanext.validation.jobs import run_validation_job, uploader, Session
 from ckanext.validation.tests.helpers import (
     VALID_REPORT,

ckanext/validation/tests/test_logic.py

@@ -47,7 +47,7 @@ def test_resource_validation_wrong_format(self):
 
             call_action("resource_validation_run", resource_id=resource["id"])
 
-        assert "Unsupported resource format" in str(e)
+        assert "Unsupported resource format" in str(e.value)
 
     def test_resource_validation_no_url_or_upload(self):
 
@@ -57,7 +57,7 @@ def test_resource_validation_no_url_or_upload(self):
 
             call_action("resource_validation_run", resource_id=resource["id"])
 
-        assert "Resource must have a valid URL" in str(e)
+        assert "Resource must have a valid URL" in str(e.value)
 
     @mock.patch("ckanext.validation.logic.enqueue_job")
     def test_resource_validation_with_url(self, mock_enqueue_job):
@@ -199,7 +199,6 @@ def test_resource_validation_only_called_on_resource_updated(
         assert mock_enqueue_job.call_args[0][1][0]["id"] == resource_1_id
 
 
-
 @pytest.mark.usefixtures("clean_db", "validation_setup", "with_plugins")
 class TestResourceValidationShow(object):
     def test_resource_validation_show_param_missing(self):
@@ -347,8 +346,9 @@ def test_run_non_auth_user(self):
         user = factories.User()
         org = factories.Organization()
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()]
+            owner_org=org["id"]
         )
+        resource = factories.Resource(package_id=dataset["id"])
 
         context = {"user": user["name"], "model": model}
 
@@ -357,7 +357,7 @@ def test_run_non_auth_user(self):
             call_auth,
             "resource_validation_run",
             context=context,
-            resource_id=dataset["resources"][0]["id"],
+            resource_id=resource["id"],
         )
 
     def test_run_auth_user(self):
@@ -367,16 +367,17 @@ def test_run_auth_user(self):
             users=[{"name": user["name"], "capacity": "editor"}]
         )
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()]
+            owner_org=org["id"]
         )
+        resource = factories.Resource(package_id=dataset["id"])
 
         context = {"user": user["name"], "model": model}
 
         assert (
             call_auth(
                 "resource_validation_run",
                 context=context,
-                resource_id=dataset["resources"][0]["id"],
+                resource_id=resource["id"],
             )
             is True
         )
@@ -416,8 +417,9 @@ def test_delete_non_auth_user(self):
         user = factories.User()
         org = factories.Organization()
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()]
+            owner_org=org["id"]
         )
+        resource = factories.Resource(package_id=dataset["id"])
 
         context = {"user": user["name"], "model": model}
 
@@ -426,7 +428,7 @@ def test_delete_non_auth_user(self):
             call_auth,
             "resource_validation_delete",
             context=context,
-            resource_id=dataset["resources"][0]["id"],
+            resource_id=resource["id"],
         )
 
     def test_delete_auth_user(self):
@@ -436,16 +438,17 @@ def test_delete_auth_user(self):
             users=[{"name": user["name"], "capacity": "editor"}]
         )
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()]
+            owner_org=org["id"]
         )
+        resource = factories.Resource(package_id=dataset["id"])
 
         context = {"user": user["name"], "model": model}
 
         assert (
             call_auth(
                 "resource_validation_delete",
                 context=context,
-                resource_id=dataset["resources"][0]["id"],
+                resource_id=resource["id"],
             )
             is True
         )
@@ -468,16 +471,17 @@ def test_show_anon_public_dataset(self):
         user = factories.User()
         org = factories.Organization()
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()], private=False
+            owner_org=org["id"], private=False
         )
+        resource = factories.Resource(package_id=dataset["id"])
 
         context = {"user": user["name"], "model": model}
 
         assert (
             call_auth(
                 "resource_validation_show",
                 context=context,
-                resource_id=dataset["resources"][0]["id"],
+                resource_id=resource["id"],
             )
             is True
         )
@@ -487,8 +491,9 @@ def test_show_anon_private_dataset(self):
         user = factories.User()
         org = factories.Organization()
         dataset = factories.Dataset(
-            owner_org=org["id"], resources=[factories.Resource()], private=True
+            owner_org=org["id"], private=True
         )
+        resource = factories.Resource(package_id=dataset["id"])
 
         context = {"user": user["name"], "model": model}
 
@@ -497,7 +502,7 @@ def test_show_anon_private_dataset(self):
             call_auth,
             "resource_validation_run",
             context=context,
-            resource_id=dataset["resources"][0]["id"],
+            resource_id=resource["id"],
         )
 
 
@@ -524,8 +529,8 @@ def test_validation_fails_on_upload(self):
             )
 
         assert "validation" in e.value.error_dict
-        assert "missing-cell" in str(e)
-        assert 'Row at position "2" has a missing cell in field "d" at position "4"' in str(e)
+        assert "missing-cell" in str(e.value)
+        assert 'Row at position "2" has a missing cell in field "d" at position "4"' in str(e.value)
 
     @pytest.mark.usefixtures("mock_uploads")
     def test_validation_fails_no_validation_object_stored(self):
@@ -536,7 +541,7 @@ def test_validation_fails_no_validation_object_stored(self):
 
         dataset = factories.Dataset()
 
-        invalid_stream = io.BufferedReader(io.BytesIO(INVALID_CSV.encode('utf8')))
+        io.BufferedReader(io.BytesIO(INVALID_CSV.encode('utf8')))
 
         validation_count_before = model.Session.query(Validation).count()
 
@@ -620,8 +625,8 @@ def test_validation_fails_on_upload(self):
                 )
 
         assert "validation" in e.value.error_dict
-        assert "missing-cell" in str(e)
-        assert 'Row at position "2" has a missing cell in field "d" at position "4"' in str(e)
+        assert "missing-cell" in str(e.value)
+        assert 'Row at position "2" has a missing cell in field "d" at position "4"' in str(e.value)
 
     @pytest.mark.usefixtures("mock_uploads")
     def test_validation_fails_no_validation_object_stored(self):

ckanext/validation/tests/test_plugin.py

@@ -1,10 +1,9 @@
 import pytest
 from unittest import mock
 
-from ckan.tests.helpers import call_action, reset_db
+from ckan.tests.helpers import call_action
 from ckan.tests import factories
 
-from ckanext.validation.model import create_tables, tables_exist
 from ckanext.validation.jobs import run_validation_job