[tool] Extend flutter test workaround to other desktops (flutter#6024)

Expand the multiple-test-files workaround in `drive-examples` from macOS to all of the desktop platforms, now that we know it's not macOS-specific. See flutter/flutter#135673
ValentinVignal · Jan 31, 2024 · 60a1ffc · 60a1ffc
1 parent 2d0f24f
commit 60a1ffc
Show file tree

Hide file tree

Showing 2 changed files with 163 additions and 49 deletions.
diff --git a/script/tool/lib/src/drive_examples_command.dart b/script/tool/lib/src/drive_examples_command.dart
@@ -404,8 +404,10 @@ class DriveExamplesCommand extends PackageLoopingCommand {
     // Workaround for https://github.com/flutter/flutter/issues/135673
     // Once that is fixed on stable, this logic can be removed and the command
     // can always just be run with "integration_test".
-    final bool needsMultipleInvocations =
-        testFiles.length > 1 && getBoolArg(platformMacOS);
+    final bool needsMultipleInvocations = testFiles.length > 1 &&
+        (getBoolArg(platformLinux) ||
+            getBoolArg(platformMacOS) ||
+            getBoolArg(platformWindows));
     final Iterable<String> individualRunTargets = needsMultipleInvocations
         ? testFiles
             .map((File f) => getRelativePosixPath(f, from: example.directory))

diff --git a/script/tool/test/drive_examples_command_test.dart b/script/tool/test/drive_examples_command_test.dart
@@ -450,57 +450,169 @@ void main() {
 
     // This tests the workaround for https://github.com/flutter/flutter/issues/135673
     // and the behavior it tests should be removed once that is fixed.
-    test('runs tests separately on macOS', () async {
-      final RepositoryPackage plugin = createFakePlugin(
-        'plugin',
-        packagesDir,
-        extraFiles: <String>[
-          'example/integration_test/first_test.dart',
-          'example/integration_test/second_test.dart',
-          'example/macos/macos.swift',
-        ],
-        platformSupport: <String, PlatformDetails>{
-          platformMacOS: const PlatformDetails(PlatformSupport.inline),
-        },
-      );
+    group('runs tests separately on desktop', () {
+      test('macOS', () async {
+        final RepositoryPackage plugin = createFakePlugin(
+          'plugin',
+          packagesDir,
+          extraFiles: <String>[
+            'example/integration_test/first_test.dart',
+            'example/integration_test/second_test.dart',
+            'example/macos/macos.swift',
+          ],
+          platformSupport: <String, PlatformDetails>{
+            platformMacOS: const PlatformDetails(PlatformSupport.inline),
+          },
+        );
 
-      final Directory pluginExampleDirectory = getExampleDir(plugin);
+        final Directory pluginExampleDirectory = getExampleDir(plugin);
 
-      final List<String> output = await runCapturingPrint(runner, <String>[
-        'drive-examples',
-        '--macos',
-      ]);
+        final List<String> output = await runCapturingPrint(runner, <String>[
+          'drive-examples',
+          '--macos',
+        ]);
 
-      expect(
-        output,
-        containsAllInOrder(<Matcher>[
-          contains('Running for plugin'),
-          contains('No issues found!'),
-        ]),
-      );
+        expect(
+          output,
+          containsAllInOrder(<Matcher>[
+            contains('Running for plugin'),
+            contains('No issues found!'),
+          ]),
+        );
 
-      expect(
-          processRunner.recordedCalls,
-          orderedEquals(<ProcessCall>[
-            ProcessCall(
-                getFlutterCommand(mockPlatform),
-                const <String>[
-                  'test',
-                  '-d',
-                  'macos',
-                  'integration_test/first_test.dart',
-                ],
-                pluginExampleDirectory.path),
-            ProcessCall(
-                getFlutterCommand(mockPlatform),
-                const <String>[
-                  'test',
-                  '-d',
-                  'macos',
-                  'integration_test/second_test.dart',
-                ],
-                pluginExampleDirectory.path),
-          ]));
+        expect(
+            processRunner.recordedCalls,
+            orderedEquals(<ProcessCall>[
+              ProcessCall(
+                  getFlutterCommand(mockPlatform),
+                  const <String>[
+                    'test',
+                    '-d',
+                    'macos',
+                    'integration_test/first_test.dart',
+                  ],
+                  pluginExampleDirectory.path),
+              ProcessCall(
+                  getFlutterCommand(mockPlatform),
+                  const <String>[
+                    'test',
+                    '-d',
+                    'macos',
+                    'integration_test/second_test.dart',
+                  ],
+                  pluginExampleDirectory.path),
+            ]));
+      });
+
+      // This tests the workaround for https://github.com/flutter/flutter/issues/135673
+      // and the behavior it tests should be removed once that is fixed.
+      test('Linux', () async {
+        final RepositoryPackage plugin = createFakePlugin(
+          'plugin',
+          packagesDir,
+          extraFiles: <String>[
+            'example/integration_test/first_test.dart',
+            'example/integration_test/second_test.dart',
+            'example/linux/foo.cc',
+          ],
+          platformSupport: <String, PlatformDetails>{
+            platformLinux: const PlatformDetails(PlatformSupport.inline),
+          },
+        );
+
+        final Directory pluginExampleDirectory = getExampleDir(plugin);
+
+        final List<String> output = await runCapturingPrint(runner, <String>[
+          'drive-examples',
+          '--linux',
+        ]);
+
+        expect(
+          output,
+          containsAllInOrder(<Matcher>[
+            contains('Running for plugin'),
+            contains('No issues found!'),
+          ]),
+        );
+
+        expect(
+            processRunner.recordedCalls,
+            orderedEquals(<ProcessCall>[
+              ProcessCall(
+                  getFlutterCommand(mockPlatform),
+                  const <String>[
+                    'test',
+                    '-d',
+                    'linux',
+                    'integration_test/first_test.dart',
+                  ],
+                  pluginExampleDirectory.path),
+              ProcessCall(
+                  getFlutterCommand(mockPlatform),
+                  const <String>[
+                    'test',
+                    '-d',
+                    'linux',
+                    'integration_test/second_test.dart',
+                  ],
+                  pluginExampleDirectory.path),
+            ]));
+      });
+
+      // This tests the workaround for https://github.com/flutter/flutter/issues/135673
+      // and the behavior it tests should be removed once that is fixed.
+      test('Windows', () async {
+        final RepositoryPackage plugin = createFakePlugin(
+          'plugin',
+          packagesDir,
+          extraFiles: <String>[
+            'example/integration_test/first_test.dart',
+            'example/integration_test/second_test.dart',
+            'example/windows/foo.cpp',
+          ],
+          platformSupport: <String, PlatformDetails>{
+            platformWindows: const PlatformDetails(PlatformSupport.inline),
+          },
+        );
+
+        final Directory pluginExampleDirectory = getExampleDir(plugin);
+
+        final List<String> output = await runCapturingPrint(runner, <String>[
+          'drive-examples',
+          '--windows',
+        ]);
+
+        expect(
+          output,
+          containsAllInOrder(<Matcher>[
+            contains('Running for plugin'),
+            contains('No issues found!'),
+          ]),
+        );
+
+        expect(
+            processRunner.recordedCalls,
+            orderedEquals(<ProcessCall>[
+              ProcessCall(
+                  getFlutterCommand(mockPlatform),
+                  const <String>[
+                    'test',
+                    '-d',
+                    'windows',
+                    'integration_test/first_test.dart',
+                  ],
+                  pluginExampleDirectory.path),
+              ProcessCall(
+                  getFlutterCommand(mockPlatform),
+                  const <String>[
+                    'test',
+                    '-d',
+                    'windows',
+                    'integration_test/second_test.dart',
+                  ],
+                  pluginExampleDirectory.path),
+            ]));
+      });
     });
 
     test('driving when plugin does not suppport web is a no-op', () async {