Harden module update compatibility cleanup

tests/test_api_smoke.py

@@ -33,13 +33,14 @@ from govoplan_core.db.bootstrap import bootstrap_dev_data
 from govoplan_core.db.session import configure_database, set_database
 from govoplan_core.core.change_sequence import decode_sequence_watermark, prune_sequence_entries
 from govoplan_core.core.pagination import encode_keyset_cursor, keyset_query_fingerprint
+from govoplan_core.tenancy.scope import create_scope_tables, scope_registry
+from govoplan_access.backend.permissions.catalog import permission_catalog as access_permission_catalog
 
 _database = configure_database(os.environ["DATABASE_URL"])
 engine = _database.engine
 SessionLocal = _database.SessionLocal
 
 from govoplan_core.server.app import app
-from govoplan_core.security.permissions import SYSTEM_SCOPES
 
 
 class ApiSmokeTests(unittest.TestCase):
@@ -56,7 +57,9 @@ class ApiSmokeTests(unittest.TestCase):
     def setUp(self) -> None:
         set_database(_database)
         self.client.cookies.clear()
+        scope_registry.metadata.drop_all(bind=engine)
         Base.metadata.drop_all(bind=engine)
+        create_scope_tables(engine)
         Base.metadata.create_all(bind=engine)
         shutil.rmtree(_TEST_ROOT / "files", ignore_errors=True)
         shutil.rmtree(_TEST_ROOT / "mock-mailbox", ignore_errors=True)
@@ -5972,7 +5975,12 @@ class ApiSmokeTests(unittest.TestCase):
         auditor = next(item for item in roles.json()["roles"] if item["slug"] == "system_auditor")
         self.assertTrue(owner["is_builtin"])
         self.assertEqual(owner["user_assignments"], 1)
-        self.assertEqual(owner["effective_permission_count"], len(SYSTEM_SCOPES))
+        expected_system_permission_count = sum(
+            1
+            for permission in access_permission_catalog(include_legacy=False)
+            if permission.level == "system"
+        )
+        self.assertEqual(owner["effective_permission_count"], expected_system_permission_count)
         self.assertEqual(owner["permissions"], ["system:*"])
         self.assertFalse(administrator["is_builtin"])
         self.assertFalse(auditor["is_builtin"])