pytest: optimization

freemindcore · freemindcore · commit c08fe0663c7b · 2022-10-12T18:52:25.000+08:00
diff --git a/setup.cfg b/setup.cfg
@@ -84,7 +84,7 @@ check_untyped_defs = True
 no_implicit_reexport = True
 
 [mypy.plugins.django-stubs]
-django_settings_module = "tests.demo_app"
+django_settings_module = "tests.easy_app"
 
 [mypy-*.migrations.*]
 # Django migrations should not produce any errors:
diff --git a/tests/config/settings.py b/tests/config/settings.py
@@ -16,7 +16,7 @@
     "django.contrib.sites",
     "django.contrib.staticfiles",
     "ninja_extra",
-    "tests.demo_app",
+    "tests.easy_app",
     "easy",
 )
 
@@ -35,7 +35,7 @@
 LANGUAGE_CODE = "en-us"
 
 STATIC_URL = "/static/"
-ROOT_URLCONF = "tests.demo_app.urls"
+ROOT_URLCONF = "tests.easy_app.urls"
 
 AUTHENTICATION_BACKENDS = ("django.contrib.auth.backends.ModelBackend",)
 
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -5,8 +5,9 @@
 
 from easy.controller.base import CrudAPIController
 from easy.testing import EasyTestClient
-from tests.demo_app.auth import JWTAuthAsync, jwt_auth_async
-from tests.demo_app.factories import UserFactory
+
+from .easy_app.auth import JWTAuthAsync, jwt_auth_async
+from .easy_app.factories import UserFactory
 
 User = get_user_model()
 
diff --git a/tests/easy_app/__init__.py b/tests/easy_app/__init__.py
diff --git a/tests/easy_app/apis.py b/tests/easy_app/apis.py
@@ -1,6 +1,7 @@
 from easy.main import EasyAPI
-from tests.demo_app.auth import jwt_auth_async
-from tests.demo_app.controllers import (
+
+from .auth import jwt_auth_async
+from .controllers import (
     AutoGenCrudAPIController,
     EasyCrudAPIController,
     PermissionAPIController,
diff --git a/tests/easy_app/apps.py b/tests/easy_app/apps.py
@@ -2,4 +2,4 @@
 
 
 class TestsConfig(AppConfig):
-    name = "tests.demo_app"
+    name = "tests.easy_app"
diff --git a/tests/easy_app/auth.py b/tests/easy_app/auth.py
diff --git a/tests/easy_app/controllers.py b/tests/easy_app/controllers.py
@@ -12,9 +12,10 @@
     IsSuperUser,
 )
 from easy.response import BaseApiResponse
-from tests.demo_app.models import Client, Event
-from tests.demo_app.schema import EventSchema
-from tests.demo_app.services import EventService
+
+from .models import Client, Event
+from .schema import EventSchema
+from .services import EventService
 
 
 @api_controller("unittest", permissions=[BaseApiPermission])
diff --git a/tests/easy_app/domain.py b/tests/easy_app/domain.py
@@ -1,5 +1,6 @@
 from easy.domain import BaseDomain
-from tests.demo_app.models import Event
+
+from .models import Event
 
 
 class EventDomain(BaseDomain):
diff --git a/tests/easy_app/factories.py b/tests/easy_app/factories.py
diff --git a/tests/easy_app/models.py b/tests/easy_app/models.py
@@ -3,7 +3,6 @@
 
 class TestBaseModel(models.Model):
     class Meta:
-        app_label = "demo_app"
         abstract = True
 
 
diff --git a/tests/easy_app/schema.py b/tests/easy_app/schema.py
diff --git a/tests/easy_app/services.py b/tests/easy_app/services.py
@@ -2,7 +2,7 @@
 
 from django.http import HttpRequest
 
-from tests.demo_app.domain import EventBiz
+from .domain import EventBiz
 
 if TYPE_CHECKING:
     from ninja_extra.controllers.base import ControllerBase  # pragma: no cover
diff --git a/tests/easy_app/urls.py b/tests/easy_app/urls.py
diff --git a/tests/test_async_api_permissions.py b/tests/test_async_api_permissions.py
@@ -4,13 +4,13 @@
 import pytest
 from asgiref.sync import sync_to_async
 
-from tests.demo_app.controllers import (
+from .easy_app.controllers import (
     AdminSitePermissionAPIController,
     AutoGenCrudAPIController,
     PermissionAPIController,
 )
-from tests.demo_app.models import Client, Event
-from tests.test_async_other_apis import dummy_data
+from .easy_app.models import Client, Event
+from .test_async_other_apis import dummy_data
 
 
 @pytest.mark.skipif(django.VERSION < (3, 1), reason="requires django 3.1 or higher")
diff --git a/tests/test_async_auto_crud_apis.py b/tests/test_async_auto_crud_apis.py
@@ -5,7 +5,7 @@
 import pytest
 from asgiref.sync import sync_to_async
 
-from tests.demo_app.controllers import (
+from .easy_app.controllers import (
     AutoGenCrudAPIController,
     AutoGenCrudNoJoinAPIController,
     AutoGenCrudSomeFieldsAPIController,
@@ -14,7 +14,7 @@
     NoCrudAPIController,
     RecursiveAPIController,
 )
-from tests.demo_app.models import Category, Client, Event, Type
+from .easy_app.models import Category, Client, Event, Type
 
 dummy_data = dict(
     title="AsyncAdminAPIEvent",
diff --git a/tests/test_async_other_apis.py b/tests/test_async_other_apis.py
@@ -5,10 +5,10 @@
 import pytest
 from asgiref.sync import sync_to_async
 
-from tests.demo_app.controllers import EasyCrudAPIController
-from tests.demo_app.models import Event, Type
-from tests.demo_app.schema import EventSchema
-from tests.demo_app.services import EventService
+from .easy_app.controllers import EasyCrudAPIController
+from .easy_app.models import Event, Type
+from .easy_app.schema import EventSchema
+from .easy_app.services import EventService
 
 dummy_data = dict(
     title="AsyncAPIEvent",
diff --git a/tests/test_auto_api_creation.py b/tests/test_auto_api_creation.py
@@ -21,10 +21,10 @@
 
 def test_auto_generate_admin_api():
     assert len(api_admin_v1._routers) == 5  # default + 3 models
-    assert "/demo_app/category" in path_names
-    assert "/demo_app/client" in path_names
-    assert "/demo_app/event" in path_names
-    assert "/demo_app/type" in path_names
+    assert "/easy_app/category" in path_names
+    assert "/easy_app/client" in path_names
+    assert "/easy_app/event" in path_names
+    assert "/easy_app/type" in path_names
 
     assert "CategoryAdminAPIController" in controller_names
     assert "EventAdminAPIController" in controller_names
@@ -47,7 +47,7 @@ async def test_auto_apis(transactional_db, easy_api_client):
 
 
 async def test_auto_generation_settings(settings):
-    settings.AUTO_ADMIN_EXCLUDE_APPS = ["tests.demo_app"]
+    settings.AUTO_ADMIN_EXCLUDE_APPS = ["tests.easy_app"]
     api_admin_v2 = EasyAPI()
     api_admin_v2.auto_create_admin_controllers()
     assert len(api_admin_v2._routers) == 1

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`
`4`	`4`	`class TestsConfig(AppConfig):`
`5`		`- name = "tests.demo_app"`
	`5`	`+ name = "tests.easy_app"`