move check/exception into the launcher

dart-lang · Jun 7, 2021 · 773c261 · 773c261
1 parent e6e3a4c
commit 773c261
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 33 deletions.
diff --git a/test/end2end/dartdoc_integration_test.dart b/test/end2end/dartdoc_integration_test.dart
@@ -91,20 +91,14 @@ void main() {
     test('invalid parameters return non-zero and print a fatal-error',
         () async {
       var outputLines = <String>[];
-      var threwException = false;
-      // consider [expectLater] when it works reliably with coverage again.
-      try {
-        await subprocessLauncher.runStreamed(
-            Platform.resolvedExecutable,
-            [
-              dartdocPath,
-              '--nonexisting',
-            ],
-            perLine: outputLines.add);
-      } on ProcessException {
-        threwException = true;
-      }
-      expect(threwException, isTrue);
+      await subprocessLauncher.runStreamed(
+          Platform.resolvedExecutable,
+          [
+            dartdocPath,
+            '--nonexisting',
+          ],
+          perLine: outputLines.add,
+          expectExitCode: 64);
       expect(
           outputLines.firstWhere((l) => l.startsWith(' fatal')),
           equals(
@@ -114,21 +108,15 @@ void main() {
     test('missing a required file path prints a fatal-error', () async {
       var outputLines = <String>[];
       var impossiblePath = path.join(dartdocPath, 'impossible');
-      var threwException = false;
-      // consider [expectLater] when it works with coverage again.
-      try {
-        await subprocessLauncher.runStreamed(
-            Platform.resolvedExecutable,
-            [
-              dartdocPath,
-              '--input',
-              impossiblePath,
-            ],
-            perLine: outputLines.add);
-      } on ProcessException {
-        threwException = true;
-      }
-      expect(threwException, isTrue);
+      await subprocessLauncher.runStreamed(
+          Platform.resolvedExecutable,
+          [
+            dartdocPath,
+            '--input',
+            impossiblePath,
+          ],
+          perLine: outputLines.add,
+          expectExitCode: 64);
       expect(
           outputLines.firstWhere((l) => l.startsWith(' fatal')),
           startsWith(

diff --git a/tool/subprocess_launcher.dart b/tool/subprocess_launcher.dart
@@ -75,7 +75,8 @@ class CoverageSubprocessLauncher extends SubprocessLauncher {
       {String workingDirectory,
       Map<String, String> environment,
       bool includeParentEnvironment = true,
-      void Function(String) perLine}) async {
+      void Function(String) perLine,
+      int expectExitCode = 0}) async {
     environment ??= {};
     assert(
         executable == Platform.executable ||
@@ -113,7 +114,8 @@ class CoverageSubprocessLauncher extends SubprocessLauncher {
         environment: environment,
         includeParentEnvironment: includeParentEnvironment,
         workingDirectory: workingDirectory,
-        perLine: parsePortAsString);
+        perLine: parsePortAsString,
+        expectExitCode: expectExitCode);
 
     if (coverageEnabled) {
       await super.runStreamed('pub', [
@@ -172,7 +174,8 @@ class SubprocessLauncher {
       {String workingDirectory,
       Map<String, String> environment,
       bool includeParentEnvironment = true,
-      void Function(String) perLine}) async {
+      void Function(String) perLine,
+      int expectExitCode = 0}) async {
     environment ??= {};
     environment.addAll(environmentDefaults);
     List<Map> jsonObjects;
@@ -257,7 +260,7 @@ class SubprocessLauncher {
     await Future.wait([stderrFuture, stdoutFuture, process.exitCode]);
 
     var exitCode = await process.exitCode;
-    if (exitCode != 0) {
+    if (exitCode != expectExitCode) {
       throw ProcessException(
           executable,
           arguments,