PyPI - udata - Versions diffs - 12.0.2.dev17__py3-none-any.whl → 12.0.2.dev19__py3-none-any.whl - Mend

udata 12.0.2.dev17py3-none-any.whl → 12.0.2.dev19py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of udata might be problematic. Click here for more details.

Files changed (115) hide show

udata/commands/tests/test_fixtures.py +2 -3
udata/core/badges/tests/test_commands.py +2 -4
udata/core/badges/tests/test_model.py +2 -2
udata/core/dataservices/models.py +4 -0
udata/core/dataservices/search.py +1 -1
udata/core/dataset/search.py +2 -2
udata/core/organization/search.py +1 -1
udata/core/pages/tests/test_api.py +0 -2
udata/core/reuse/search.py +1 -1
udata/core/spatial/tests/test_api.py +17 -20
udata/core/spatial/tests/test_models.py +3 -3
udata/core/user/tests/test_user_model.py +2 -6
udata/features/identicon/tests/test_backends.py +3 -13
udata/harvest/tests/ckan/test_ckan_backend.py +300 -337
udata/harvest/tests/ckan/test_ckan_backend_errors.py +94 -99
udata/harvest/tests/ckan/test_ckan_backend_filters.py +128 -122
udata/harvest/tests/ckan/test_dkan_backend.py +39 -51
udata/harvest/tests/test_actions.py +7 -7
udata/harvest/tests/test_api.py +2 -4
udata/harvest/tests/test_base_backend.py +3 -4
udata/harvest/tests/test_dcat_backend.py +4 -6
udata/harvest/tests/test_models.py +2 -4
udata/harvest/tests/test_notifications.py +2 -4
udata/harvest/tests/test_tasks.py +2 -3
udata/tests/__init__.py +40 -58
udata/tests/api/__init__.py +87 -2
udata/tests/api/test_activities_api.py +17 -23
udata/tests/api/test_auth_api.py +2 -4
udata/tests/api/test_contact_points.py +48 -54
udata/tests/api/test_dataservices_api.py +0 -2
udata/tests/api/test_datasets_api.py +15 -29
udata/tests/api/test_me_api.py +4 -6
udata/tests/api/test_organizations_api.py +19 -38
udata/tests/api/test_reports_api.py +0 -4
udata/tests/api/test_reuses_api.py +9 -19
udata/tests/api/test_swagger.py +2 -3
udata/tests/api/test_tags_api.py +6 -7
udata/tests/api/test_transfer_api.py +0 -2
udata/tests/api/test_user_api.py +8 -10
udata/tests/apiv2/test_datasets.py +0 -4
udata/tests/apiv2/test_me_api.py +0 -2
udata/tests/apiv2/test_organizations.py +0 -2
udata/tests/apiv2/test_swagger.py +2 -3
udata/tests/apiv2/test_topics.py +0 -2
udata/tests/cli/test_cli_base.py +14 -12
udata/tests/cli/test_db_cli.py +51 -54
udata/tests/contact_point/test_contact_point_models.py +2 -2
udata/tests/dataservice/test_csv_adapter.py +2 -5
udata/tests/dataservice/test_dataservice_rdf.py +3 -6
udata/tests/dataservice/test_dataservice_tasks.py +36 -38
udata/tests/dataset/test_csv_adapter.py +2 -5
udata/tests/dataset/test_dataset_actions.py +2 -4
udata/tests/dataset/test_dataset_commands.py +2 -4
udata/tests/dataset/test_dataset_events.py +3 -3
udata/tests/dataset/test_dataset_model.py +6 -7
udata/tests/dataset/test_dataset_rdf.py +6 -9
udata/tests/dataset/test_dataset_recommendations.py +2 -2
udata/tests/dataset/test_dataset_tasks.py +66 -68
udata/tests/dataset/test_resource_preview.py +39 -48
udata/tests/dataset/test_transport_tasks.py +2 -2
udata/tests/features/territories/__init__.py +0 -6
udata/tests/features/territories/test_territories_api.py +25 -24
udata/tests/forms/test_current_user_field.py +2 -2
udata/tests/forms/test_dict_field.py +2 -4
udata/tests/forms/test_extras_fields.py +2 -3
udata/tests/forms/test_image_field.py +2 -2
udata/tests/forms/test_model_field.py +2 -4
udata/tests/forms/test_publish_as_field.py +2 -4
udata/tests/forms/test_user_forms.py +26 -29
udata/tests/frontend/test_auth.py +2 -3
udata/tests/frontend/test_csv.py +5 -6
udata/tests/frontend/test_error_handlers.py +2 -3
udata/tests/frontend/test_hooks.py +5 -7
udata/tests/frontend/test_markdown.py +3 -4
udata/tests/helpers.py +2 -7
udata/tests/metrics/test_metrics.py +52 -48
udata/tests/metrics/test_tasks.py +154 -150
udata/tests/organization/test_csv_adapter.py +2 -5
udata/tests/organization/test_notifications.py +2 -4
udata/tests/organization/test_organization_model.py +3 -4
udata/tests/organization/test_organization_rdf.py +2 -8
udata/tests/plugin.py +6 -110
udata/tests/reuse/test_reuse_model.py +3 -4
udata/tests/site/test_site_api.py +0 -2
udata/tests/site/test_site_csv_exports.py +0 -2
udata/tests/site/test_site_metrics.py +2 -4
udata/tests/site/test_site_model.py +2 -2
udata/tests/site/test_site_rdf.py +3 -6
udata/tests/test_activity.py +3 -3
udata/tests/test_api_fields.py +6 -9
udata/tests/test_cors.py +0 -2
udata/tests/test_dcat_commands.py +2 -3
udata/tests/test_discussions.py +2 -7
udata/tests/test_mail.py +4 -10
udata/tests/test_migrations.py +413 -419
udata/tests/test_model.py +10 -11
udata/tests/test_notifications.py +2 -3
udata/tests/test_owned.py +3 -3
udata/tests/test_routing.py +5 -5
udata/tests/test_storages.py +6 -5
udata/tests/test_tags.py +2 -1
udata/tests/test_topics.py +2 -4
udata/tests/test_transfer.py +4 -5
udata/tests/topic/test_topic_tasks.py +25 -27
udata/tests/user/test_user_rdf.py +2 -8
udata/tests/workers/test_jobs_commands.py +2 -2
udata/tests/workers/test_tasks_routing.py +27 -27
{udata-12.0.2.dev17.dist-info → udata-12.0.2.dev19.dist-info}/METADATA +1 -1
{udata-12.0.2.dev17.dist-info → udata-12.0.2.dev19.dist-info}/RECORD +113 -115
udata/tests/frontend/__init__.py +0 -23
udata/tests/metrics/conftest.py +0 -15
{udata-12.0.2.dev17.dist-info → udata-12.0.2.dev19.dist-info}/WHEEL +0 -0
{udata-12.0.2.dev17.dist-info → udata-12.0.2.dev19.dist-info}/entry_points.txt +0 -0
{udata-12.0.2.dev17.dist-info → udata-12.0.2.dev19.dist-info}/licenses/LICENSE +0 -0
{udata-12.0.2.dev17.dist-info → udata-12.0.2.dev19.dist-info}/top_level.txt +0 -0

udata/harvest/tests/ckan/test_ckan_backend_errors.py CHANGED Viewed

@@ -2,11 +2,7 @@ import pytest
 from udata.harvest import actions
 from udata.harvest.tests.factories import HarvestSourceFactory
-pytestmark = [
-    pytest.mark.usefixtures("clean_db"),
-    pytest.mark.options(PLUGINS=["ckan"]),
-]
+from udata.tests.api import PytestOnlyDBTestCase
 CKAN_URL = "https://harvest.me/"
 API_URL = "{}api/3/action/package_list".format(CKAN_URL)
@@ -17,124 +13,123 @@ API_URL = "{}api/3/action/package_list".format(CKAN_URL)
 STATUS_CODE = (400, 500)
-@pytest.mark.parametrize("code", STATUS_CODE)
-def test_html_error(rmock, code):
-    # Happens with wrong source URL (html is returned instead of json)
-    html = "<html><body>Error</body></html>"
-    source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
-    rmock.get(API_URL, text=html, status_code=code, headers={"Content-Type": "text/html"})
-    actions.run(source)
-    source.reload()
-    job = source.get_last_job()
-    assert len(job.items) == 0
-    assert len(job.errors) == 1
-    error = job.errors[0]
-    # HTML is detected and does not clutter the message
-    assert html not in error.message
-@pytest.mark.parametrize("code", STATUS_CODE)
-def test_plain_text_error(rmock, code):
-    source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
-    rmock.get(
-        API_URL, text='"Some error"', status_code=code, headers={"Content-Type": "text/plain"}
-    )
+@pytest.mark.options(PLUGINS=["ckan"])
+class CkanBackendErrorsTest(PytestOnlyDBTestCase):
+    @pytest.mark.parametrize("code", STATUS_CODE)
+    def test_html_error(self, rmock, code):
+        # Happens with wrong source URL (html is returned instead of json)
+        html = "<html><body>Error</body></html>"
+        source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
-    actions.run(source)
+        rmock.get(API_URL, text=html, status_code=code, headers={"Content-Type": "text/html"})
-    source.reload()
+        actions.run(source)
-    job = source.get_last_job()
-    assert len(job.items) == 0
-    assert len(job.errors) == 1
-    error = job.errors[0]
-    # Raw quoted string is properly unquoted
-    http_message = "Server Error" if code == 500 else "Client Error"
-    assert (
-        error.message
-        == f"{code} {http_message}: None for url: https://harvest.me/api/3/action/package_list"
-    )
+        source.reload()
+        job = source.get_last_job()
+        assert len(job.items) == 0
+        assert len(job.errors) == 1
+        error = job.errors[0]
+        # HTML is detected and does not clutter the message
+        assert html not in error.message
-def test_200_plain_text_error(rmock):
-    source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
+    @pytest.mark.parametrize("code", STATUS_CODE)
+    def test_plain_text_error(self, rmock, code):
+        source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
-    rmock.get(API_URL, text='"Some error"', status_code=200, headers={"Content-Type": "text/plain"})
+        rmock.get(
+            API_URL, text='"Some error"', status_code=code, headers={"Content-Type": "text/plain"}
+        )
-    actions.run(source)
+        actions.run(source)
-    source.reload()
+        source.reload()
-    job = source.get_last_job()
-    assert len(job.items) == 0
-    assert len(job.errors) == 1
-    error = job.errors[0]
-    # Raw quoted string is properly unquoted
-    assert error.message == "Some error"
+        job = source.get_last_job()
+        assert len(job.items) == 0
+        assert len(job.errors) == 1
+        error = job.errors[0]
+        # Raw quoted string is properly unquoted
+        http_message = "Server Error" if code == 500 else "Client Error"
+        assert (
+            error.message
+            == f"{code} {http_message}: None for url: https://harvest.me/api/3/action/package_list"
+        )
+    def test_200_plain_text_error(self, rmock):
+        source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
-def test_standard_api_json_error(rmock):
-    json = {"success": False, "error": "an error"}
-    source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
+        rmock.get(
+            API_URL, text='"Some error"', status_code=200, headers={"Content-Type": "text/plain"}
+        )
-    rmock.get(API_URL, json=json, status_code=200, headers={"Content-Type": "application/json"})
+        actions.run(source)
-    actions.run(source)
+        source.reload()
-    source.reload()
+        job = source.get_last_job()
+        assert len(job.items) == 0
+        assert len(job.errors) == 1
+        error = job.errors[0]
+        # Raw quoted string is properly unquoted
+        assert error.message == "Some error"
-    job = source.get_last_job()
-    assert len(job.items) == 0
-    assert len(job.errors) == 1
-    error = job.errors[0]
-    assert error.message == "an error"
+    def test_standard_api_json_error(self, rmock):
+        json = {"success": False, "error": "an error"}
+        source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
+        rmock.get(API_URL, json=json, status_code=200, headers={"Content-Type": "application/json"})
-def test_standard_api_json_error_with_details(rmock):
-    json = {
-        "success": False,
-        "error": {
-            "message": "an error",
-        },
-    }
-    source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
+        actions.run(source)
-    rmock.get(API_URL, json=json, status_code=200, headers={"Content-Type": "application/json"})
+        source.reload()
-    actions.run(source)
+        job = source.get_last_job()
+        assert len(job.items) == 0
+        assert len(job.errors) == 1
+        error = job.errors[0]
+        assert error.message == "an error"
-    source.reload()
+    def test_standard_api_json_error_with_details(self, rmock):
+        json = {
+            "success": False,
+            "error": {
+                "message": "an error",
+            },
+        }
+        source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
-    job = source.get_last_job()
-    assert len(job.items) == 0
-    assert len(job.errors) == 1
-    error = job.errors[0]
-    assert error.message == "an error"
+        rmock.get(API_URL, json=json, status_code=200, headers={"Content-Type": "application/json"})
+        actions.run(source)
-def test_standard_api_json_error_with_details_and_type(rmock):
-    json = {
-        "success": False,
-        "error": {
-            "message": "Access denied",
-            "__type": "Authorization Error",
-        },
-    }
-    source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
+        source.reload()
-    rmock.get(API_URL, json=json, status_code=200, headers={"Content-Type": "application/json"})
+        job = source.get_last_job()
+        assert len(job.items) == 0
+        assert len(job.errors) == 1
+        error = job.errors[0]
+        assert error.message == "an error"
-    actions.run(source)
+    def test_standard_api_json_error_with_details_and_type(self, rmock):
+        json = {
+            "success": False,
+            "error": {
+                "message": "Access denied",
+                "__type": "Authorization Error",
+            },
+        }
+        source = HarvestSourceFactory(backend="ckan", url=CKAN_URL)
-    source.reload()
+        rmock.get(API_URL, json=json, status_code=200, headers={"Content-Type": "application/json"})
-    job = source.get_last_job()
-    assert len(job.items) == 0
-    assert len(job.errors) == 1
-    error = job.errors[0]
-    assert error.message == "Authorization Error: Access denied"
+        actions.run(source)
+        source.reload()
+        job = source.get_last_job()
+        assert len(job.items) == 0
+        assert len(job.errors) == 1
+        error = job.errors[0]
+        assert error.message == "Authorization Error: Access denied"

udata/harvest/tests/ckan/test_ckan_backend_filters.py CHANGED Viewed

@@ -4,127 +4,133 @@ import pytest
 from udata.harvest import actions
 from udata.harvest.tests.factories import HarvestSourceFactory
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.utils import faker
-pytestmark = [
-    pytest.mark.usefixtures("clean_db"),
-    pytest.mark.options(PLUGINS=["ckan"]),
-]
-def test_include_org_filter(ckan, rmock):
-    source = HarvestSourceFactory(
-        backend="ckan",
-        url=ckan.BASE_URL,
-        config={"filters": [{"key": "organization", "value": "organization_name"}]},
-    )
-    rmock.get(
-        ckan.PACKAGE_SEARCH_URL,
-        json={"success": True, "result": {"results": []}},
-        status_code=200,
-        headers={"Content-Type": "application/json"},
-    )
-    actions.run(source)
-    source.reload()
-    assert rmock.call_count == 1
-    params = {"q": "organization:organization_name", "rows": 1000}
-    assert rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
-def test_exclude_org_filter(ckan, rmock):
-    source = HarvestSourceFactory(
-        backend="ckan",
-        url=ckan.BASE_URL,
-        config={
-            "filters": [{"key": "organization", "value": "organization_name", "type": "exclude"}]
-        },
-    )
-    rmock.get(
-        ckan.PACKAGE_SEARCH_URL,
-        json={"success": True, "result": {"results": []}},
-        status_code=200,
-        headers={"Content-Type": "application/json"},
-    )
-    actions.run(source)
-    source.reload()
-    assert rmock.call_count == 1
-    params = {"q": "-organization:organization_name", "rows": 1000}
-    assert rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
-def test_tag_filter(ckan, rmock):
-    tag = faker.word()
-    source = HarvestSourceFactory(
-        backend="ckan", url=ckan.BASE_URL, config={"filters": [{"key": "tags", "value": tag}]}
-    )
-    rmock.get(
-        ckan.PACKAGE_SEARCH_URL,
-        json={"success": True, "result": {"results": []}},
-        status_code=200,
-        headers={"Content-Type": "application/json"},
-    )
-    actions.run(source)
-    source.reload()
-    assert rmock.call_count == 1
-    params = {"q": f"tags:{tag}", "rows": 1000}
-    assert rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
-def test_exclude_tag_filter(ckan, rmock):
-    tag = faker.word()
-    source = HarvestSourceFactory(
-        backend="ckan",
-        url=ckan.BASE_URL,
-        config={"filters": [{"key": "tags", "value": tag, "type": "exclude"}]},
-    )
-    rmock.get(
-        ckan.PACKAGE_SEARCH_URL,
-        json={"success": True, "result": {"results": []}},
-        status_code=200,
-        headers={"Content-Type": "application/json"},
-    )
-    actions.run(source)
-    source.reload()
-    assert rmock.call_count == 1
-    params = {"q": f"-tags:{tag}", "rows": 1000}
-    assert rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
-def test_can_have_multiple_filters(ckan, rmock):
-    source = HarvestSourceFactory(
-        backend="ckan",
-        url=ckan.BASE_URL,
-        config={
-            "filters": [
-                {"key": "organization", "value": "organization_name"},
-                {"key": "tags", "value": "tag-2", "type": "exclude"},
-            ]
-        },
-    )
-    rmock.get(
-        ckan.PACKAGE_SEARCH_URL,
-        json={"success": True, "result": {"results": []}},
-        status_code=200,
-        headers={"Content-Type": "application/json"},
-    )
-    actions.run(source)
-    source.reload()
-    assert rmock.call_count == 1
-    params = {"q": "organization:organization_name AND -tags:tag-2", "rows": 1000}
-    assert rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
+@pytest.mark.options(PLUGINS=["ckan"])
+class CkanBackendFilterTest(PytestOnlyDBTestCase):
+    def test_include_org_filter(self, ckan, rmock):
+        source = HarvestSourceFactory(
+            backend="ckan",
+            url=ckan.BASE_URL,
+            config={"filters": [{"key": "organization", "value": "organization_name"}]},
+        )
+        rmock.get(
+            ckan.PACKAGE_SEARCH_URL,
+            json={"success": True, "result": {"results": []}},
+            status_code=200,
+            headers={"Content-Type": "application/json"},
+        )
+        actions.run(source)
+        source.reload()
+        assert rmock.call_count == 1
+        params = {"q": "organization:organization_name", "rows": 1000}
+        assert (
+            rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
+        )
+    def test_exclude_org_filter(self, ckan, rmock):
+        source = HarvestSourceFactory(
+            backend="ckan",
+            url=ckan.BASE_URL,
+            config={
+                "filters": [
+                    {"key": "organization", "value": "organization_name", "type": "exclude"}
+                ]
+            },
+        )
+        rmock.get(
+            ckan.PACKAGE_SEARCH_URL,
+            json={"success": True, "result": {"results": []}},
+            status_code=200,
+            headers={"Content-Type": "application/json"},
+        )
+        actions.run(source)
+        source.reload()
+        assert rmock.call_count == 1
+        params = {"q": "-organization:organization_name", "rows": 1000}
+        assert (
+            rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
+        )
+    def test_tag_filter(self, ckan, rmock):
+        tag = faker.word()
+        source = HarvestSourceFactory(
+            backend="ckan", url=ckan.BASE_URL, config={"filters": [{"key": "tags", "value": tag}]}
+        )
+        rmock.get(
+            ckan.PACKAGE_SEARCH_URL,
+            json={"success": True, "result": {"results": []}},
+            status_code=200,
+            headers={"Content-Type": "application/json"},
+        )
+        actions.run(source)
+        source.reload()
+        assert rmock.call_count == 1
+        params = {"q": f"tags:{tag}", "rows": 1000}
+        assert (
+            rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
+        )
+    def test_exclude_tag_filter(self, ckan, rmock):
+        tag = faker.word()
+        source = HarvestSourceFactory(
+            backend="ckan",
+            url=ckan.BASE_URL,
+            config={"filters": [{"key": "tags", "value": tag, "type": "exclude"}]},
+        )
+        rmock.get(
+            ckan.PACKAGE_SEARCH_URL,
+            json={"success": True, "result": {"results": []}},
+            status_code=200,
+            headers={"Content-Type": "application/json"},
+        )
+        actions.run(source)
+        source.reload()
+        assert rmock.call_count == 1
+        params = {"q": f"-tags:{tag}", "rows": 1000}
+        assert (
+            rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
+        )
+    def test_can_have_multiple_filters(self, ckan, rmock):
+        source = HarvestSourceFactory(
+            backend="ckan",
+            url=ckan.BASE_URL,
+            config={
+                "filters": [
+                    {"key": "organization", "value": "organization_name"},
+                    {"key": "tags", "value": "tag-2", "type": "exclude"},
+                ]
+            },
+        )
+        rmock.get(
+            ckan.PACKAGE_SEARCH_URL,
+            json={"success": True, "result": {"results": []}},
+            status_code=200,
+            headers={"Content-Type": "application/json"},
+        )
+        actions.run(source)
+        source.reload()
+        assert rmock.call_count == 1
+        params = {"q": "organization:organization_name AND -tags:tag-2", "rows": 1000}
+        assert (
+            rmock.last_request.url == f"{ckan.PACKAGE_SEARCH_URL}?{urllib.parse.urlencode(params)}"
+        )

udata/harvest/tests/ckan/test_dkan_backend.py CHANGED Viewed

@@ -4,13 +4,11 @@ from datetime import datetime
 import pytest
-from udata.app import create_app
 from udata.core.organization.factories import OrganizationFactory
 from udata.harvest import actions
 from udata.harvest.tests.factories import HarvestSourceFactory
 from udata.models import Dataset
-from udata.settings import Defaults, Testing
-from udata.tests.plugin import drop_db
+from udata.tests.api import PytestOnlyDBTestCase
 def data_path(filename):
@@ -18,51 +16,41 @@ def data_path(filename):
     return os.path.join(os.path.dirname(__file__), "data", filename)
-class DkanSettings(Testing):
-    PLUGINS = ["dkan"]
-@pytest.fixture(scope="module")
-def app(request):
-    """Create an udata app once for the module."""
-    app = create_app(Defaults, override=DkanSettings)
-    with app.app_context():
-        drop_db(app)
-    yield app
-    with app.app_context():
-        drop_db(app)
-def test_dkan_french_w_license(app, rmock):
-    """CKAN Harvester should accept the minimum dataset payload"""
-    DKAN_URL = "https://harvest.me/"
-    API_URL = "{}api/3/action/".format(DKAN_URL)
-    PACKAGE_LIST_URL = "{}package_list".format(API_URL)
-    PACKAGE_SHOW_URL = "{}package_show".format(API_URL)
-    with open(data_path("dkan-french-w-license.json")) as ifile:
-        data = json.loads(ifile.read())
-    org = OrganizationFactory()
-    source = HarvestSourceFactory(backend="dkan", url=DKAN_URL, organization=org)
-    rmock.get(
-        PACKAGE_LIST_URL,
-        json={"success": True, "result": ["fake-name"]},
-        status_code=200,
-        headers={"Content-Type": "application/json"},
-    )
-    rmock.get(
-        PACKAGE_SHOW_URL, json=data, status_code=200, headers={"Content-Type": "application/json"}
-    )
-    actions.run(source)
-    source.reload()
-    assert source.get_last_job().status == "done"
-    datasets = Dataset.objects.filter(organization=org)
-    assert len(datasets) > 0
-    dataset = datasets.get(**{"harvest__remote_id": "04be6288-696d-4331-850d-a144871a7e3a"})
-    assert dataset.harvest.created_at == datetime(2019, 12, 10, 0, 0)
-    assert dataset.harvest.modified_at == datetime(2019, 9, 30, 0, 0)
-    assert len(dataset.resources) == 2
-    assert "xlsx" in [r.format for r in dataset.resources]
+@pytest.mark.options(PLUGINS=["dkan"])
+class DkanBackendTest(PytestOnlyDBTestCase):
+    def test_dkan_french_w_license(self, rmock):
+        """CKAN Harvester should accept the minimum dataset payload"""
+        DKAN_URL = "https://harvest.me/"
+        API_URL = "{}api/3/action/".format(DKAN_URL)
+        PACKAGE_LIST_URL = "{}package_list".format(API_URL)
+        PACKAGE_SHOW_URL = "{}package_show".format(API_URL)
+        with open(data_path("dkan-french-w-license.json")) as ifile:
+            data = json.loads(ifile.read())
+        org = OrganizationFactory()
+        source = HarvestSourceFactory(backend="dkan", url=DKAN_URL, organization=org)
+        rmock.get(
+            PACKAGE_LIST_URL,
+            json={"success": True, "result": ["fake-name"]},
+            status_code=200,
+            headers={"Content-Type": "application/json"},
+        )
+        rmock.get(
+            PACKAGE_SHOW_URL,
+            json=data,
+            status_code=200,
+            headers={"Content-Type": "application/json"},
+        )
+        actions.run(source)
+        source.reload()
+        assert source.get_last_job().status == "done"
+        datasets = Dataset.objects.filter(organization=org)
+        assert len(datasets) > 0
+        dataset = datasets.get(**{"harvest__remote_id": "04be6288-696d-4331-850d-a144871a7e3a"})
+        assert dataset.harvest.created_at == datetime(2019, 12, 10, 0, 0)
+        assert dataset.harvest.modified_at == datetime(2019, 9, 30, 0, 0)
+        assert len(dataset.resources) == 2
+        assert "xlsx" in [r.format for r in dataset.resources]

udata/harvest/tests/test_actions.py CHANGED Viewed

@@ -16,6 +16,7 @@ from udata.core.dataset.models import HarvestDatasetMetadata
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import UserFactory
 from udata.models import Dataset, PeriodicTask
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.tests.helpers import assert_emit, assert_equal_dates, assert_not_emit
 from udata.utils import faker
@@ -40,12 +41,8 @@ from .factories import (
 log = logging.getLogger(__name__)
-pytestmark = [
-    pytest.mark.usefixtures("clean_db"),
-]
-class HarvestActionsTest:
+class HarvestActionsTest(PytestOnlyDBTestCase):
     def test_list_backends(self):
         for backend in actions.list_backends():
             assert issubclass(backend, BaseBackend)
@@ -453,7 +450,10 @@ class HarvestActionsTest:
         assert result.errors == 1
-class ExecutionTestMixin(MockBackendsMixin):
+class ExecutionTestMixin(MockBackendsMixin, PytestOnlyDBTestCase):
+    def action(self, *args, **kwargs):
+        raise NotImplementedError
     def test_default(self):
         org = OrganizationFactory()
         source = HarvestSourceFactory(backend="factory", organization=org)
@@ -610,7 +610,7 @@ class HarvestRunTest(ExecutionTestMixin):
         return actions.run(*args, **kwargs)
-class HarvestPreviewTest(MockBackendsMixin):
+class HarvestPreviewTest(MockBackendsMixin, PytestOnlyDBTestCase):
     def test_preview(self):
         org = OrganizationFactory()
         source = HarvestSourceFactory(backend="factory", organization=org)

udata/harvest/tests/test_api.py CHANGED Viewed

@@ -8,6 +8,7 @@ from pytest_mock import MockerFixture
 from udata.core.organization.factories import OrganizationFactory
 from udata.core.user.factories import AdminFactory, UserFactory
 from udata.models import Member, PeriodicTask
+from udata.tests.api import PytestOnlyAPITestCase
 from udata.tests.helpers import assert200, assert201, assert204, assert400, assert403, assert404
 from udata.tests.plugin import ApiClient
 from udata.utils import faker
@@ -25,10 +26,7 @@ from .factories import HarvestSourceFactory, MockBackendsMixin
 log = logging.getLogger(__name__)
-@pytest.mark.usefixtures("clean_db")
-class HarvestAPITest(MockBackendsMixin):
-    modules = []
+class HarvestAPITest(MockBackendsMixin, PytestOnlyAPITestCase):
     def test_list_backends(self, api):
         """It should fetch the harvest backends list from the API"""
         response = api.get(url_for("api.harvest_backends"))

udata 12.0.2.dev17__py3-none-any.whl → 12.0.2.dev19__py3-none-any.whl

Potentially problematic release.

udata 12.0.2.dev17py3-none-any.whl → 12.0.2.dev19py3-none-any.whl