Refactor slow integration tests.

build_daemon/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - Bump the min SDK to 3.7.0.
 - Remove unused dep: `analyzer`.
+- Add `connectUnchecked` for use in tests.
 
 ## 4.0.4
 

build_daemon/lib/client.dart

@@ -169,6 +169,9 @@ class BuildDaemonClient {
 
   /// Connects to the current daemon instance.
   ///
+  /// The options of the running daemon are checked against [daemonCommand].
+  /// If there is a mismatch, an exception is thrown.
+  ///
   /// If one is not running, a new daemon instance will be started.
   static Future<BuildDaemonClient> connect(
     String workingDirectory,
@@ -180,8 +183,6 @@ class BuildDaemonClient {
     BuildMode buildMode = BuildMode.Auto,
   }) async {
     logHandler ??= (_) {};
-    final daemonSerializers = serializersOverride ?? serializers;
-
     final daemonArgs = daemonCommand.sublist(1)
       ..add('--$buildModeFlag=$buildMode');
 
@@ -196,6 +197,26 @@ class BuildDaemonClient {
 
     await _handleDaemonStartup(process, logHandler);
 
+    return connectUnchecked(
+      workingDirectory,
+      serializersOverride: serializersOverride,
+      logHandler: logHandler,
+    );
+  }
+
+  /// Connects to the current daemon instance.
+  ///
+  /// Does not check the options the daemon is running with, so this is
+  /// primarily useful in tests where the daemon has just been launched.
+  ///
+  /// To connect and check the options, use [connect].
+  static Future<BuildDaemonClient> connectUnchecked(
+    String workingDirectory, {
+    Serializers? serializersOverride,
+    void Function(ServerLog)? logHandler,
+  }) async {
+    logHandler ??= (_) {};
+    final daemonSerializers = serializersOverride ?? serializers;
     return BuildDaemonClient._(
       await _existingPort(workingDirectory),
       daemonSerializers,

build_runner/dart_test.yaml

@@ -3,9 +3,11 @@ presets:
     include_tags: experiments
 
 tags:
-  slow:
-    timeout: 16x
-  integration:
+  integration1:
+    timeout: 4x
+  integration2:
+    timeout: 4x
+  integration3:
     timeout: 4x
   experiments:
     skip: 'Only ran if `-P experiments` is passed'

build_runner/mono_pkg.yaml

@@ -9,17 +9,19 @@ stages:
   - format
   - analyze: --fatal-infos .
 - unit_test:
-  - test: -x integration -x slow --test-randomize-ordering-seed=random
+  - test: -x integration1 -x integration2 -x integration3 --test-randomize-ordering-seed=random
   - test: -P experiments --test-randomize-ordering-seed=random
-  - test: -t integration --test-randomize-ordering-seed=random
+  - test: -t integration1 --test-randomize-ordering-seed=random
+    os:
+    - linux
+    - windows
+  - test: -t integration2 --test-randomize-ordering-seed=random
+    os:
+    - linux
+    - windows
+  - test: -t integration3 --test-randomize-ordering-seed=random
     os:
     - linux
     - windows
 - leak_check:
   - command: ../tool/leak_check.sh
-- e2e_test:
-  - test: -t slow --total-shards 5 --shard-index 0 --test-randomize-ordering-seed=random -j 1
-  - test: -t slow --total-shards 5 --shard-index 1 --test-randomize-ordering-seed=random -j 1
-  - test: -t slow --total-shards 5 --shard-index 2 --test-randomize-ordering-seed=random -j 1
-  - test: -t slow --total-shards 5 --shard-index 3 --test-randomize-ordering-seed=random -j 1
-  - test: -t slow --total-shards 5 --shard-index 4 --test-randomize-ordering-seed=random -j 1