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

udata/tests/test_model.py

@@ -12,10 +12,9 @@ from udata.i18n import _
 from udata.models import Dataset
 from udata.mongo import build_test_config, db, validate_config
 from udata.settings import Defaults
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.tests.helpers import assert_equal_dates, assert_json_equal
 
-pytestmark = [pytest.mark.usefixtures("clean_db")]
-
 
 class UUIDTester(db.Document):
     uuid = db.AutoUUIDField()
@@ -70,7 +69,7 @@ class PrivateURLTester(db.Document):
     url = db.URLField(private=True)
 
 
-class AutoUUIDFieldTest:
+class AutoUUIDFieldTest(PytestOnlyDBTestCase):
     def test_auto_populate(self):
         """AutoUUIDField should populate itself if not set"""
         obj = UUIDTester()
@@ -103,7 +102,7 @@ class AutoUUIDFieldTest:
         assert isinstance(obj.uuid, UUID)
 
 
-class SlugFieldTest:
+class SlugFieldTest(PytestOnlyDBTestCase):
     def test_populate_on_pre_save_signal_is_registered(self):
         """populate_on_pre_save signal should be registered"""
         # It isn't registered on startup
@@ -278,7 +277,7 @@ class SlugFieldTest:
         assert field.slugify("à-€-ü") == "a-eur-u"
 
 
-class DateFieldTest:
+class DateFieldTest(PytestOnlyDBTestCase):
     def test_none_if_empty_and_not_required(self):
         obj = DateTester()
         assert obj.a_date is None
@@ -308,7 +307,7 @@ class DateFieldTest:
             obj.save()
 
 
-class DateRangeFieldTest:
+class DateRangeFieldTest(PytestOnlyDBTestCase):
     def test_none_if_empty_and_not_required(self):
         obj = DateRangeTester()
         assert obj.temporal is None
@@ -390,7 +389,7 @@ class DateRangeFieldTest:
         assert obj.temporal.end == end
 
 
-class URLFieldTest:
+class URLFieldTest(PytestOnlyDBTestCase):
     def test_none_if_empty_and_not_required(self):
         obj = URLTester()
         assert obj.url is None
@@ -422,7 +421,7 @@ class URLFieldTest:
             URLTester(url=url).save()
 
 
-class DatetimedTest:
+class DatetimedTest(PytestOnlyDBTestCase):
     def test_class(self):
         assert isinstance(DatetimedTester.created_at, db.DateTimeField)
         assert isinstance(DatetimedTester.last_modified, db.DateTimeField)
@@ -483,7 +482,7 @@ class DatetimedTest:
         assert_equal_dates(datetimed.last_modified, manual)
 
 
-class ExtrasFieldTest:
+class ExtrasFieldTest(PytestOnlyDBTestCase):
     def test_default_validate_primitive_type(self):
         class Tester(db.Document):
             extras = db.ExtrasField()
@@ -608,7 +607,7 @@ class ExtrasFieldTest:
         )
 
 
-class ModelResolutionTest:
+class ModelResolutionTest(PytestOnlyDBTestCase):
     def test_resolve_exact_match(self):
         assert db.resolve_model("Dataset") == Dataset
 
@@ -632,7 +631,7 @@ class ModelResolutionTest:
             db.resolve_model({"field": "value"})
 
 
-class MongoConfigTest:
+class MongoConfigTest(PytestOnlyDBTestCase):
     def test_validate_default_value(self):
         validate_config({"MONGODB_HOST": Defaults.MONGODB_HOST})
 

udata/tests/test_notifications.py

@@ -6,8 +6,7 @@ from flask import url_for
 from udata.core.user.factories import UserFactory
 from udata.features.notifications import actions
 
-from . import DBTestMixin, TestCase
-from .api import APITestCase
+from .api import APITestCase, DBTestCase
 
 
 class NotificationsMixin(object):
@@ -15,7 +14,7 @@ class NotificationsMixin(object):
         actions._providers = {}
 
 
-class NotificationsActionsTest(NotificationsMixin, TestCase, DBTestMixin):
+class NotificationsActionsTest(NotificationsMixin, DBTestCase):
     def test_registered_provider_is_listed(self):
         def fake_provider(user):
             return []

udata/tests/test_owned.py

@@ -7,7 +7,7 @@ from udata.core.user.factories import AdminFactory, UserFactory
 from udata.core.user.models import User
 from udata.models import Member
 from udata.mongo import db
-from udata.tests import DBTestMixin, TestCase
+from udata.tests.api import DBTestCase
 
 
 class CustomQuerySet(owned.OwnedQuerySet):
@@ -41,7 +41,7 @@ def compute_some_metrics(document, **kwargs):
     document.save(signal_kwargs={"ignores": ["post_save"]})
 
 
-class TestOwnedMixin(DBTestMixin, TestCase):
+class TestOwned(DBTestCase):
     def test_fields(self):
         self.assertIsInstance(Owned.owner, db.ReferenceField)
         self.assertEqual(Owned.owner.document_type_obj, User)
@@ -136,7 +136,7 @@ class TestOwnedMixin(DBTestMixin, TestCase):
         assert owned.organization is None
 
 
-class OwnedQuerysetTest(DBTestMixin, TestCase):
+class OwnedQuerysetTest(DBTestCase):
     def test_queryset_type(self):
         self.assertIsInstance(Owned.objects, owned.OwnedQuerySet)
 

udata/tests/test_routing.py

@@ -9,10 +9,12 @@ from udata.core.spatial.factories import GeoZoneFactory
 from udata.core.spatial.models import GeoZone
 from udata.mongo import db
 from udata.mongo.slug_fields import SlugFollow
+from udata.tests import PytestOnlyTestCase
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.tests.helpers import assert200, assert404, assert_redirects
 
 
-class UUIDConverterTest:
+class UUIDConverterTest(PytestOnlyTestCase):
     @pytest.fixture(autouse=True)
     def setup(self, app):
         @app.route("/uuid/<uuid:uuid>")
@@ -67,8 +69,7 @@ class RedirectTesterConverter(routing.ModelConverter):
     model = RedirectTester
 
 
-@pytest.mark.usefixtures("clean_db")
-class ModelConverterMixin:
+class ModelConverterMixin(PytestOnlyDBTestCase):
     @pytest.fixture(autouse=True)
     def setup(self, app):
         app.url_map.converters["tester"] = self.converter
@@ -295,9 +296,8 @@ class SlugAsSLugFieldWithFollowTest(AsSlugMixin):
         assert SlugFollow.objects.count() == 0
 
 
-@pytest.mark.usefixtures("clean_db")
 @pytest.mark.options(TERRITORY_DEFAULT_PREFIX="fr")  # Not implemented
-class TerritoryConverterTest:
+class TerritoryConverterTest(PytestOnlyDBTestCase):
     @pytest.fixture(autouse=True)
     def setup(self, app):
         @app.route("/territory/<territory:territory>")

udata/tests/test_storages.py

@@ -12,12 +12,14 @@ from udata.core import storages
 from udata.core.storages import utils
 from udata.core.storages.api import META, chunk_filename
 from udata.core.storages.tasks import purge_chunks
+from udata.tests import PytestOnlyTestCase
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.utils import faker
 
 from .helpers import assert200, assert400
 
 
-class StorageUtilsTest:
+class StorageUtilsTest(PytestOnlyTestCase):
     """
     Perform all tests on a file of size 2 * CHUNCK_SIZE = 2 * (2 ** 16).
     Expected values are precomputed with shell `md5sum`, `sha1sum`...
@@ -88,8 +90,7 @@ class StorageUtilsTest:
         assert utils.normalize("éàü@€.txt") == "eau-eur.txt"
 
 
-@pytest.mark.usefixtures("app")
-class ConfigurableAllowedExtensionsTest:
+class ConfigurableAllowedExtensionsTest(PytestOnlyTestCase):
     def test_has_default(self):
         assert "csv" in storages.CONFIGURABLE_AUTHORIZED_TYPES
         assert "xml" in storages.CONFIGURABLE_AUTHORIZED_TYPES
@@ -107,7 +108,7 @@ class ConfigurableAllowedExtensionsTest:
 
 
 @pytest.mark.usefixtures("instance_path")
-class StorageUploadViewTest:
+class StorageUploadViewTest(PytestOnlyDBTestCase):
     def test_standard_upload(self, client):
         client.login()
         response = client.post(
@@ -221,7 +222,7 @@ class StorageUploadViewTest:
 
 
 @pytest.mark.usefixtures("instance_path")
-class ChunksRetentionTest:
+class ChunksRetentionTest(PytestOnlyTestCase):
     def create_chunks(self, uuid, nb=3, last=None):
         for i in range(nb):
             storages.chunks.write(chunk_filename(uuid, i), faker.word())

udata/tests/test_tags.py

@@ -10,6 +10,7 @@ from udata.core.reuse.factories import ReuseFactory
 from udata.core.tags.models import Tag
 from udata.core.tags.tasks import count_tags
 from udata.tags import normalize, slug, tags_list
+from udata.tests import PytestOnlyTestCase
 from udata.tests.helpers import assert200
 
 log = logging.getLogger(__name__)
@@ -61,7 +62,7 @@ class TagsTests:
             assert tag.counts["reuses"] == count
 
 
-class TagsUtilsTest:
+class TagsUtilsTest(PytestOnlyTestCase):
     def test_tags_list(self):
         assert tags_list("") == []
         assert tags_list("a") == ["a"]

udata/tests/test_topics.py

@@ -17,6 +17,7 @@ from udata.core.topic.factories import (
 )
 from udata.core.topic.models import Topic, TopicElement
 from udata.search import reindex
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.tests.helpers import assert_emit
 
 
@@ -31,10 +32,7 @@ def job_reindex_undelayed(mocker):
     return mocker.patch.object(reindex, "delay", side_effect=reindex)
 
 
-pytestmark = pytest.mark.usefixtures("clean_db")
-
-
-class TopicModelTest:
+class TopicModelTest(PytestOnlyDBTestCase):
     def test_pre_save(self, job_reindex):
         topic = TopicFactory()
 

udata/tests/test_transfer.py

@@ -14,12 +14,11 @@ from udata.features.transfer.actions import accept_transfer, request_transfer
 from udata.features.transfer.factories import TransferFactory
 from udata.features.transfer.notifications import transfer_request_notifications
 from udata.models import Member
+from udata.tests.api import PytestOnlyDBTestCase
 from udata.utils import faker
 
-pytestmark = pytest.mark.usefixtures("clean_db")
 
-
-class TransferStartTest:
+class TransferStartTest(PytestOnlyDBTestCase):
     def assert_transfer_started(self, subject, owner, recipient, comment):
         transfer = request_transfer(subject, recipient, comment)
 
@@ -102,7 +101,7 @@ class TransferStartTest:
             self.assert_transfer_started(dataset, org, org, comment)
 
 
-class TransferAcceptTest:
+class TransferAcceptTest(PytestOnlyDBTestCase):
     def test_recipient_user_can_accept_transfer(self):
         owner = UserFactory()
         recipient = UserFactory()
@@ -175,7 +174,7 @@ class TransferAcceptTest:
             accept_transfer(transfer)
 
 
-class TransferNotificationsTest:
+class TransferNotificationsTest(PytestOnlyDBTestCase):
     def test_pending_transfer_request_for_user(self):
         user = UserFactory()
         datasets = DatasetFactory.create_batch(2, owner=user)

udata/tests/topic/test_topic_tasks.py

@@ -1,34 +1,32 @@
-import pytest
-
 from udata.core.dataservices.tasks import purge_dataservices
 from udata.core.dataset.tasks import purge_datasets
 from udata.core.reuse.tasks import purge_reuses
 from udata.core.topic.factories import TopicWithElementsFactory
 from udata.core.topic.tasks import purge_topics_elements
-
-pytestmark = pytest.mark.usefixtures("clean_db")
+from udata.tests.api import PytestOnlyDBTestCase
 
 
-def test_purge_topics_elements():
-    topic = TopicWithElementsFactory()
-    assert len(topic.elements) > 0
-    for element in topic.elements:
-        element.title = None
-        element.save()
-        # Handle different deletion field names across models
-        if hasattr(element.element, "deleted_at"):
-            element.element.deleted_at = "2023-01-01"
-        else:
-            element.element.deleted = "2023-01-01"
-        element.element.save()
-    topic.save()
-    # remove the dataset elements marked as deleted
-    purge_datasets()
-    # remove the reuse elements marked as deleted
-    purge_reuses()
-    # remove the dataservices elements marked as deleted
-    purge_dataservices()
-    # remove the topic elements that have neither title nor element
-    purge_topics_elements()
-    topic.reload()
-    assert len(topic.elements) == 0
+class TopicTasksTest(PytestOnlyDBTestCase):
+    def test_purge_topics_elements(self):
+        topic = TopicWithElementsFactory()
+        assert len(topic.elements) > 0
+        for element in topic.elements:
+            element.title = None
+            element.save()
+            # Handle different deletion field names across models
+            if hasattr(element.element, "deleted_at"):
+                element.element.deleted_at = "2023-01-01"
+            else:
+                element.element.deleted = "2023-01-01"
+            element.element.save()
+        topic.save()
+        # remove the dataset elements marked as deleted
+        purge_datasets()
+        # remove the reuse elements marked as deleted
+        purge_reuses()
+        # remove the dataservices elements marked as deleted
+        purge_dataservices()
+        # remove the topic elements that have neither title nor element
+        purge_topics_elements()
+        topic.reload()
+        assert len(topic.elements) == 0

udata/tests/user/test_user_rdf.py

@@ -3,19 +3,13 @@ from rdflib import BNode, Literal, URIRef
 from rdflib.namespace import FOAF, RDF, RDFS
 from rdflib.resource import Resource as RdfResource
 
-from udata import api
 from udata.core.user.factories import UserFactory
 from udata.core.user.rdf import user_to_rdf
-from udata.tests import DBTestMixin, TestCase
+from udata.tests.api import APITestCase
 from udata.utils import faker
 
 
-class UserToRdfTest(DBTestMixin, TestCase):
-    def create_app(self):
-        app = super(UserToRdfTest, self).create_app()
-        api.init_app(app)
-        return app
-
+class UserToRdfTest(APITestCase):
     def test_minimal(self):
         user = UserFactory.build()  # Does not have an URL
         u = user_to_rdf(user)

udata/tests/workers/test_jobs_commands.py

@@ -5,6 +5,7 @@ import pytest
 from udata.core.jobs.commands import job_label
 from udata.core.jobs.models import PeriodicTask
 from udata.tasks import job
+from udata.tests.api import PytestOnlyDBTestCase
 
 log = logging.getLogger(__name__)
 
@@ -26,8 +27,7 @@ def job_run(mocker):
     return mocker.patch.object(do_nothing, "run")
 
 
-@pytest.mark.usefixtures("clean_db")
-class JobsCommandsTest:
+class JobsCommandsTest(PytestOnlyDBTestCase):
     def test_list_jobs(self, cli):
         result = cli("job list")
         assert JOB_NAME in result.output

udata/tests/workers/test_tasks_routing.py

@@ -1,6 +1,7 @@
 import pytest
 
 from udata.tasks import celery, job, task
+from udata.tests import PytestOnlyTestCase
 from udata.utils import unique_string
 
 TASKS = [
@@ -33,37 +34,36 @@ def fake_task(*args, **kwargs):
     pass
 
 
-@pytest.fixture
-def route_to(app, mocker):
-    def assertion(func, args, kwargs, queue, key=None):
-        __tracebackhide__ = True
+class TasksRoutingTest(PytestOnlyTestCase):
+    @pytest.fixture
+    def route_to(self, app, mocker):
+        def assertion(func, args, kwargs, queue, key=None):
+            __tracebackhide__ = True
 
-        decorator = func(*args, **kwargs) if args or kwargs else func
-        router = celery.amqp.router
+            decorator = func(*args, **kwargs) if args or kwargs else func
+            router = celery.amqp.router
 
-        # Celery instanciate only one task by name so we need unique names
-        suffix = unique_string().replace("-", "_")
-        fake_task.__name__ = "task_{0}".format(suffix)
-        t = decorator(fake_task)
+            # Celery instanciate only one task by name so we need unique names
+            suffix = unique_string().replace("-", "_")
+            fake_task.__name__ = "task_{0}".format(suffix)
+            t = decorator(fake_task)
 
-        options = t._get_exec_options()
+            options = t._get_exec_options()
 
-        route = router.route(options, t.name, task_type=t)
-        if queue:
-            assert route["queue"].name == queue, "queue mismatch"
-        if key:
-            key = key.format(name=t.name)
-            assert route["routing_key"] == key, "routing_key mismatch"
-        return route
+            route = router.route(options, t.name, task_type=t)
+            if queue:
+                assert route["queue"].name == queue, "queue mismatch"
+            if key:
+                key = key.format(name=t.name)
+                assert route["routing_key"] == key, "routing_key mismatch"
+            return route
 
-    return assertion
+        return assertion
 
+    @pytest.mark.parametrize("kwargs,queue,key", TASKS, ids=idify(TASKS))
+    def test_tasks_routing(self, route_to, kwargs, queue, key):
+        route_to(task, [], kwargs, queue, key)
 
-@pytest.mark.parametrize("kwargs,queue,key", TASKS, ids=idify(TASKS))
-def test_tasks_routing(route_to, kwargs, queue, key):
-    route_to(task, [], kwargs, queue, key)
-
-
-@pytest.mark.parametrize("kwargs,queue,key", JOBS, ids=idify(JOBS))
-def test_job_routing(route_to, kwargs, queue, key):
-    route_to(job, [unique_string()], kwargs, queue, key)
+    @pytest.mark.parametrize("kwargs,queue,key", JOBS, ids=idify(JOBS))
+    def test_job_routing(self, route_to, kwargs, queue, key):
+        route_to(job, [unique_string()], kwargs, queue, key)

{udata-12.0.2.dev17.dist-info → udata-12.0.2.dev18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: udata
-Version: 12.0.2.dev17
+Version: 12.0.2.dev18
 Summary: Open data portal
 Author-email: Opendata Team <opendatateam@data.gouv.fr>
 Maintainer-email: Opendata Team <opendatateam@data.gouv.fr>