tests: Sort files before sharding

Author: def-

test/cloudtest/test_full_testdrive.py

@@ -24,8 +24,8 @@ def test_full_testdrive(mz: MaterializeApplication) -> None:
     parser.add_argument("--file-pattern", default="*.td", type=str)
     args, _ = parser.parse_known_args()
 
-    matching_files = glob.glob(
-        f"testdrive/{args.file_pattern}", root_dir=MZ_ROOT / "test"
+    matching_files = sorted(
+        glob.glob(f"testdrive/{args.file_pattern}", root_dir=MZ_ROOT / "test")
     )
 
     # TODO: database-issues#7827 (test requires fivetran running in cloudtest)

test/kafka-auth/mzcompose.py

@@ -271,12 +271,14 @@ def workflow_default(c: Composition, parser: WorkflowArgumentParser) -> None:
     )
 
     files = buildkite.shard_list(
-        [
-            file
-            for file in glob.glob(
-                f"test-{args.filter}.td", root_dir=MZ_ROOT / "test" / "kafka-auth"
-            )
-        ],
+        sorted(
+            [
+                file
+                for file in glob.glob(
+                    f"test-{args.filter}.td", root_dir=MZ_ROOT / "test" / "kafka-auth"
+                )
+            ]
+        ),
         lambda file: file,
     )
     c.test_parts(files, c.run_testdrive_files)

test/mysql-cdc-old-syntax/mzcompose.py

@@ -119,8 +119,8 @@ def workflow_cdc(c: Composition, parser: WorkflowArgumentParser) -> None:
         matching_files.extend(
             glob.glob(filter, root_dir=MZ_ROOT / "test" / "mysql-cdc-old-syntax")
         )
-    sharded_files: list[str] = sorted(
-        buildkite.shard_list(matching_files, lambda file: file)
+    sharded_files: list[str] = buildkite.shard_list(
+        sorted(matching_files), lambda file: file
     )
     print(f"Files: {sharded_files}")
 
@@ -310,9 +310,8 @@ def workflow_migration(c: Composition, parser: WorkflowArgumentParser) -> None:
         matching_files.extend(
             glob.glob(filter, root_dir=MZ_ROOT / "test" / "mysql-cdc-old-syntax")
         )
-
-    sharded_files: list[str] = sorted(
-        buildkite.shard_list(matching_files, lambda file: file)
+    sharded_files: list[str] = buildkite.shard_list(
+        sorted(matching_files), lambda file: file
     )
     print(f"Files: {sharded_files}")
 

test/mysql-cdc/mzcompose.py

@@ -108,8 +108,8 @@ def workflow_cdc(c: Composition, parser: WorkflowArgumentParser) -> None:
         matching_files.extend(
             glob.glob(filter, root_dir=MZ_ROOT / "test" / "mysql-cdc")
         )
-    sharded_files: list[str] = sorted(
-        buildkite.shard_list(matching_files, lambda file: file)
+    sharded_files: list[str] = buildkite.shard_list(
+        sorted(matching_files), lambda file: file
     )
     print(f"Files: {sharded_files}")
 

test/pg-cdc-old-syntax/mzcompose.py

@@ -309,8 +309,8 @@ def workflow_cdc(c: Composition, parser: WorkflowArgumentParser) -> None:
         matching_files.extend(
             glob.glob(filter, root_dir=MZ_ROOT / "test" / "pg-cdc-old-syntax")
         )
-    sharded_files: list[str] = sorted(
-        buildkite.shard_list(matching_files, lambda file: file)
+    sharded_files: list[str] = buildkite.shard_list(
+        sorted(matching_files), lambda file: file
     )
     print(f"Files: {sharded_files}")
 
@@ -391,8 +391,8 @@ def workflow_migration(c: Composition, parser: WorkflowArgumentParser) -> None:
         matching_files.extend(
             glob.glob(filter, root_dir=MZ_ROOT / "test" / "pg-cdc-old-syntax")
         )
-    sharded_files: list[str] = sorted(
-        buildkite.shard_list(matching_files, lambda file: file)
+    sharded_files: list[str] = buildkite.shard_list(
+        sorted(matching_files), lambda file: file
     )
     print(f"Files: {sharded_files}")
 

test/pg-cdc/mzcompose.py

@@ -295,8 +295,8 @@ def workflow_cdc(c: Composition, parser: WorkflowArgumentParser) -> None:
     matching_files = []
     for filter in args.filter:
         matching_files.extend(glob.glob(filter, root_dir=MZ_ROOT / "test" / "pg-cdc"))
-    sharded_files: list[str] = sorted(
-        buildkite.shard_list(matching_files, lambda file: file)
+    sharded_files: list[str] = buildkite.shard_list(
+        sorted(matching_files), lambda file: file
     )
     print(f"Files: {sharded_files}")
 

test/secrets-logging/mzcompose.py

@@ -75,13 +75,15 @@ def process(file: str) -> None:
         )
 
     files = buildkite.shard_list(
-        [
-            file
-            for pattern in args.files
-            for file in glob.glob(
-                pattern, root_dir=MZ_ROOT / "test" / "secrets-logging"
-            )
-        ],
+        sorted(
+            [
+                file
+                for pattern in args.files
+                for file in glob.glob(
+                    pattern, root_dir=MZ_ROOT / "test" / "secrets-logging"
+                )
+            ]
+        ),
         lambda file: file,
     )
     c.test_parts(files, process)

test/testdrive-old-kafka-src-syntax/mzcompose.py

@@ -308,6 +308,7 @@ def workflow_migration(c: Composition, parser: WorkflowArgumentParser) -> None:
         for file in matching_files
         if file != "session.td" and file != "status-history.td"
     ]
+    matching_files = sorted(matching_files)
 
     dependencies = [
         "fivetran-destination",

test/testdrive/mzcompose.py

@@ -230,11 +230,15 @@ def process(file: str) -> None:
             os.remove(f"test/testdrive/{junit_report}")
 
         files = buildkite.shard_list(
-            [
-                file
-                for pattern in args.files
-                for file in glob.glob(pattern, root_dir=MZ_ROOT / "test" / "testdrive")
-            ],
+            sorted(
+                [
+                    file
+                    for pattern in args.files
+                    for file in glob.glob(
+                        pattern, root_dir=MZ_ROOT / "test" / "testdrive"
+                    )
+                ]
+            ),
             lambda file: file,
         )
         c.test_parts(files, process)