Refactor tests to namespace generated schema into models.{schema}

Author: 1st1

gel/_testbase.py

@@ -754,6 +754,10 @@ def setUpClass(cls):
             td_kwargs["delete"] = not cls.orm_debug
 
         cls.tmp_model_dir = tempfile.TemporaryDirectory(**td_kwargs)
+
+        assert isinstance(cls.SCHEMA, str)
+        short_name = pathlib.Path(cls.SCHEMA).stem
+
         if cls.orm_debug:
             print(cls.tmp_model_dir.name)
 
@@ -766,7 +770,15 @@ def setUpClass(cls):
         try:
             gen_client.ensure_connected()
             cls.gen = PydanticModelsGenerator(
-                argparse.Namespace(no_cache=True, quiet=True, output=None),
+                argparse.Namespace(
+                    no_cache=True,
+                    quiet=True,
+                    output=(
+                        pathlib.Path(cls.tmp_model_dir.name)
+                        / "models"
+                        / short_name
+                    ).absolute(),
+                ),
                 project_dir=pathlib.Path(cls.tmp_model_dir.name),
                 client=gen_client,
                 interactive=False,

tests/dbsetup/empty.gel

@@ -0,0 +1 @@
+# keep this file empty!

tests/test_async_model.py

@@ -20,7 +20,7 @@ class TestAsyncModelGenerator(tb.AsyncModelTestCase):
 
     @tb.must_fail  # this test ensures that @typecheck is working
     async def test_async_modelgen__smoke_test_01(self):
-        from models import default
+        from models.orm import default
 
         self.assertEqual(reveal_type(default.User.groups), "this must fail")
 
@@ -30,7 +30,7 @@ async def test_async_modelgen__smoke_test_02(self):
         raise AssertionError("this must fail")
 
     async def test_async_modelgen_01(self):
-        from models import default
+        from models.orm import default
 
         alice = await self.client.query_required_single(
             default.User.select(
@@ -50,7 +50,7 @@ async def test_async_modelgen_01(self):
     async def test_async_modelgen_02(self):
         import uuid
 
-        from models import default
+        from models.orm import default
         # insert an object with a required multi: no link props, one object
         # added to the link
 
@@ -80,7 +80,7 @@ async def test_async_modelgen_02(self):
         self.assertEqual(m.nickname, "Hannibal")
 
     async def test_async_modelgen_save_refetch_modes(self):
-        from models import default
+        from models.orm import default
 
         u1 = default.User(name="Al")
         await self.client.sync(u1)
@@ -94,7 +94,7 @@ async def test_async_modelgen_save_reload_links_07(self):
         # This is a copy if test_async_modelgen_save_reload_links_07
         # ensuring the sync() is fully supported in async mode.
 
-        from models import default
+        from models.orm import default
 
         # Test backlink invalidation when adding a user to a different group
         # Fetch red and blue groups with nested user data and their groups
@@ -153,7 +153,7 @@ async def test_async_modelgen_save_reload_links_07(self):
         self.assertEqual({u.id for u in blue.users}, {alice.id})
 
     async def test_async_modelgen_sync_warning(self):
-        from models import default
+        from models.orm import default
 
         g = default.UserGroup(
             name="Pickle Pirates",