sync prerelease_deps and system test

parthea · parthea · commit b102cea31b8f · 2026-04-22T19:43:09.000Z
diff --git a/packages/google-cloud-spanner/mypy.ini b/packages/google-cloud-spanner/mypy.ini
@@ -14,3 +14,4 @@ explicit_package_bases = True
 # Performance: reuse results from previous runs to speed up 'nox'
 incremental = True
 
+
diff --git a/packages/google-cloud-spanner/noxfile.py b/packages/google-cloud-spanner/noxfile.py
@@ -655,6 +655,13 @@ def prerelease_deps(session, protobuf_implementation, database_dialect):
     system_test_path = os.path.join("tests", "system.py")
     system_test_folder_path = os.path.join("tests", "system")
 
+    system_test_exists = os.path.exists(system_test_path)
+    system_test_folder_exists = os.path.exists(system_test_folder_path)
+    # Sanity check: only run tests if found.
+    if not system_test_exists and not system_test_folder_exists:
+        session.skip("System tests were not found")
+
+
     if os.environ.get("SPANNER_EMULATOR_HOST"):
         # Run tests against the emulator
         run_system = True
@@ -675,24 +682,75 @@ def prerelease_deps(session, protobuf_implementation, database_dialect):
         run_system = False
 
     if run_system:
-        # Run the tests (deduplicated logic)
-        test_path = (
-            system_test_path
-            if os.path.exists(system_test_path)
-            else system_test_folder_path
-        )
-        session.run(
-            "py.test",
-            "--verbose",
-            f"--junitxml=system_{session.python}_sponge_log.xml",
-            test_path,
-            *session.posargs,
-            env={
-                "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
-                "SPANNER_DATABASE_DIALECT": database_dialect,
-                "SKIP_BACKUP_TESTS": "true",
-            },
-        )
+        # Run py.test against the system tests.
+        if system_test_exists:
+            args = [
+                "py.test",
+                "--quiet",
+                "-o",
+                "asyncio_mode=auto",
+                f"--junitxml=system_{session.python}_sponge_log.xml",
+            ]
+            if not session.posargs:
+                args.append(system_test_path)
+            args.extend(session.posargs)
+
+            session.run(
+                *args,
+                env={
+                    "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+                    "SPANNER_DATABASE_DIALECT": database_dialect,
+                    "SKIP_BACKUP_TESTS": "true",
+                },
+            )
+        elif system_test_folder_exists:
+            # Run sync tests
+            sync_args = [
+                "py.test",
+                "--quiet",
+                "-o",
+                "asyncio_mode=auto",
+                f"--junitxml=system_{session.python}_sync_sponge_log.xml",
+            ]
+            if not session.posargs:
+                sync_args.append(os.path.join("tests", "system"))
+                sync_args.append("--ignore=tests/system/_async")
+            else:
+                sync_args.extend(session.posargs)
+
+            session.run(
+                *sync_args,
+                env={
+                    "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+                    "SPANNER_DATABASE_DIALECT": database_dialect,
+                    "SKIP_BACKUP_TESTS": "true",
+                },
+            )
+
+            # Run async tests
+            async_args = [
+                "py.test",
+                "--quiet",
+                "-o",
+                "asyncio_mode=auto",
+                f"--junitxml=system_{session.python}_async_sponge_log.xml",
+            ]
+            if not session.posargs:
+                async_args.append(os.path.join("tests", "system", "_async"))
+            else:
+                # If posargs are provided, only run if they match async tests
+                # or just skip if they were already run in sync.
+                # For simplicity, we only run async folder if no posargs.
+                return
+
+            session.run(
+                *async_args,
+                env={
+                    "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation,
+                    "SPANNER_DATABASE_DIALECT": database_dialect,
+                    "SKIP_BACKUP_TESTS": "true",
+                },
+            )
 
 
 @nox.session(python=ALL_PYTHON)

Original file line number	Diff line number	Diff line change
`@@ -14,3 +14,4 @@ explicit_package_bases = True`
`14`	`14`	`# Performance: reuse results from previous runs to speed up 'nox'`
`15`	`15`	`incremental = True`
`16`	`16`
	`17`	`+`