[gardening] Run subtests in parallel to avoid timeout for lib/isolate/spawn_uri__package_uri__test Should make this test run within the normal timeout period. TEST=ci Change-Id: Ie8048a6cc7c31b193cf326bf9742fad279411b44 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/237688 Reviewed-by: Tess Strickland <sstrickl@google.com> Commit-Queue: Martin Kustermann <kustermann@google.com>
diff --git a/tests/lib/isolate/spawn_uri__package_uri__test.dart b/tests/lib/isolate/spawn_uri__package_uri__test.dart index d5efa2c..b212874 100644 --- a/tests/lib/isolate/spawn_uri__package_uri__test.dart +++ b/tests/lib/isolate/spawn_uri__package_uri__test.dart
@@ -12,6 +12,7 @@ main() async { // Run the Dart VM with or without: // --packages=<packages|package_config> + final futures = <Future>[]; for (final runWithPackagesArg in const [true, false]) { // Run the isolate with or without // Isolate.spawnUri(..., packageConfig: <packages|package_config>) @@ -20,15 +21,16 @@ print('TEST spawnWithPackageConfig = $spawnWithPackageConfig '); final bool checkForResolveUri = runWithPackagesArg || !spawnWithPackageConfig; - await runDotPackagesTest( - runWithPackagesArg, spawnWithPackageConfig, checkForResolveUri); + futures.add(runDotPackagesTest( + runWithPackagesArg, spawnWithPackageConfig, checkForResolveUri)); for (final optionalPackageUri in const [true, false]) { print('TEST optionalPackageUri = $optionalPackageUri'); - await runPackageConfigTest(runWithPackagesArg, spawnWithPackageConfig, - optionalPackageUri, checkForResolveUri); + futures.add(runPackageConfigTest(runWithPackagesArg, + spawnWithPackageConfig, optionalPackageUri, checkForResolveUri)); } } } + await Future.wait(futures); } Future runPackageConfigTest(bool withPackagesArg, bool spawnWithArg,
diff --git a/tests/lib_2/isolate/spawn_uri__package_uri__test.dart b/tests/lib_2/isolate/spawn_uri__package_uri__test.dart index 46d4a14..23d4707 100644 --- a/tests/lib_2/isolate/spawn_uri__package_uri__test.dart +++ b/tests/lib_2/isolate/spawn_uri__package_uri__test.dart
@@ -14,6 +14,7 @@ main() async { // Run the Dart VM with or without: // --packages=<packages|package_config> + final futures = <Future>[]; for (final runWithPackagesArg in const [true, false]) { // Run the isolate with or without // Isolate.spawnUri(..., packageConfig: <packages|package_config>) @@ -22,15 +23,16 @@ print('TEST spawnWithPackageConfig = $spawnWithPackageConfig '); final bool checkForResolveUri = runWithPackagesArg || !spawnWithPackageConfig; - await runDotPackagesTest( - runWithPackagesArg, spawnWithPackageConfig, checkForResolveUri); + futures.add(runDotPackagesTest( + runWithPackagesArg, spawnWithPackageConfig, checkForResolveUri)); for (final optionalPackageUri in const [true, false]) { print('TEST optionalPackageUri = $optionalPackageUri'); - await runPackageConfigTest(runWithPackagesArg, spawnWithPackageConfig, - optionalPackageUri, checkForResolveUri); + futures.add(runPackageConfigTest(runWithPackagesArg, + spawnWithPackageConfig, optionalPackageUri, checkForResolveUri)); } } } + await Future.wait(futures); } Future runPackageConfigTest(bool withPackagesArg, bool spawnWithArg,