Retry commands that may time out fake server or the browser starts in tests. (#8638)

Author: isoos

pkg/pub_integration/lib/src/fake_pub_server_process.dart

@@ -8,6 +8,7 @@ import 'dart:io';
 import 'dart:math';
 
 import 'package:path/path.dart' as p;
+import 'package:retry/retry.dart';
 
 final _random = Random.secure();
 
@@ -100,12 +101,22 @@ class FakePubServerProcess {
 
     await lockFile.create();
     try {
-      final pr1 =
-          await Process.run('dart', ['pub', 'get'], workingDirectory: appDir);
-      if (pr1.exitCode != 0) {
-        throw Exception(
-            'dart pub get failed in app\n${pr1.stdout}\n${pr1.stderr}');
-      }
+      await retry(
+        maxAttempts: 2,
+        retryIf: (e) => e is TimeoutException,
+        () async {
+          final pr1 = await Process.run(
+            'dart',
+            ['pub', 'get'],
+            workingDirectory: appDir,
+          ).timeout(Duration(seconds: 15));
+
+          if (pr1.exitCode != 0) {
+            throw Exception(
+                'dart pub get failed in app\n${pr1.stdout}\n${pr1.stderr}');
+          }
+        },
+      );
     } finally {
       await lockFile.delete();
     }

pkg/pub_integration/lib/src/test_browser.dart

@@ -2,12 +2,14 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
 import 'package:_pub_shared/validation/html/html_validation.dart';
 import 'package:path/path.dart' as p;
 import 'package:puppeteer/puppeteer.dart';
+import 'package:retry/retry.dart';
 
 import 'screenshot_utils.dart';
 
@@ -49,10 +51,19 @@ class TestBrowser {
     ];
 
     for (final binary in binaries) {
-      if (File(binary).existsSync()) {
+      if (!File(binary).existsSync()) {
+        continue;
+      }
+      try {
         // Get the local chrome's main version
-        final pr = await Process.run(binary, ['--version'])
-            .timeout(Duration(seconds: 5));
+        final pr = await retry(
+          maxAttempts: 2,
+          retryIf: (e) => e is TimeoutException,
+          () async {
+            return await Process.run(binary, ['--version'])
+                .timeout(Duration(seconds: 5));
+          },
+        );
         final output = pr.stdout.toString();
         final mainVersion = output
             .split(' ')
@@ -67,6 +78,9 @@ class TestBrowser {
         if (mainVersion >= 132) continue;
 
         return binary;
+      } on TimeoutException catch (_) {
+        print('Unable to detect chrome version with $binary');
+        continue;
       }
     }
 

pkg/pub_integration/pubspec.yaml

@@ -13,6 +13,7 @@ dependencies:
   path: ^1.8.0
   pub_semver: ^2.0.0
   puppeteer: 3.16.0
+  retry: ^3.1.2
   oauth2: ^2.0.0
 
 dev_dependencies: