|
20 | 20 | import ci_preflight |
21 | 21 | import ci_verify |
22 | 22 | from ci_verifier_classes import select_test_ids, verifier_class_tier |
23 | | -from run_unittest_shards import discover_test_ids |
| 23 | +from ci_run_unittest_shards import discover_test_ids |
24 | 24 | from ci_preflight import (AUTHZ_ALWAYS, AUTHZ_REFUSE_STEP, CORES, |
25 | 25 | DOCS_ONLY_SKIP, GITHUB_ONLY_SKIP, HEAVY_SKIP, HOSTED_MATRIX_RUNNER, JOB_COMMANDS, |
26 | 26 | PR_RUNNER, POST_RUNNER, MATRIX_LINUX_RUNNER, MATRIX_RUNNER, |
@@ -6450,7 +6450,7 @@ def assert_release_kernel_native_full_debug_sanitizers_exclude_slow(self, ci, re |
6450 | 6450 | verifier_class_tier(env))), discovered) |
6451 | 6451 | plan = {name: argv for name, argv in check_commands(ROOT, env=env, tier='slow')} |
6452 | 6452 | self.assertEqual(plan['verifier-tests'], [ |
6453 | | - sys.executable, str(ROOT / 'scripts/run_unittest_shards.py'), |
| 6453 | + sys.executable, str(ROOT / 'scripts/ci_run_unittest_shards.py'), |
6454 | 6454 | str(ROOT / 'scripts/test_ci_verify.py'), '--log-dir', |
6455 | 6455 | str(ROOT / 'build-ci-preflight/verifier-tests-shards')]) |
6456 | 6456 |
|
@@ -6478,7 +6478,7 @@ def test_release_kernel_native_keep_rows_debug_sanitizers_exclude_slow_all_class |
6478 | 6478 | ' steps:\n - run: python3 scripts/ci_verify.py release --exclude-label slow\n')) |
6479 | 6479 |
|
6480 | 6480 | def test_verifier_stage_defers_slow_only_for_an_explicit_pr_answer(self): |
6481 | | - base = [sys.executable, str(ROOT / 'scripts/run_unittest_shards.py'), |
| 6481 | + base = [sys.executable, str(ROOT / 'scripts/ci_run_unittest_shards.py'), |
6482 | 6482 | str(ROOT / 'scripts/test_ci_verify.py'), '--log-dir', |
6483 | 6483 | str(ROOT / 'build-ci-preflight/verifier-tests-shards')] |
6484 | 6484 | for answer, expected in (('false', base + ['--class-tier', 'fast']), |
@@ -8359,7 +8359,7 @@ def test_preflight_stage_shards_every_test_with_cpu_cap_and_separate_logs(self): |
8359 | 8359 | ROOT, output, env={'GITHUB_EVENT_NAME': 'pull_request'}, tier=tier) |
8360 | 8360 | }['preflight-tests'] |
8361 | 8361 | self.assertEqual(argv, [ |
8362 | | - sys.executable, str(ROOT / 'scripts/run_unittest_shards.py'), |
| 8362 | + sys.executable, str(ROOT / 'scripts/ci_run_unittest_shards.py'), |
8363 | 8363 | str(ROOT / 'scripts/test_ci_preflight.py'), |
8364 | 8364 | '--shards', str(expected), |
8365 | 8365 | '--log-dir', str(output / 'preflight-tests-shards'), |
|
0 commit comments