fix async?

testing/dart/canvas_test.dart

@@ -7,7 +7,6 @@ import 'dart:io';
 import 'dart:math';
 import 'dart:typed_data';
 import 'dart:ui';
-import 'dart:isolate';
 
 import 'package:litetest/litetest.dart';
 import 'package:path/path.dart' as path;
@@ -127,7 +126,6 @@ void testNoCrashes() {
 }
 
 void main() async {
-  ReceivePort port = ReceivePort('test');
   final ImageComparer comparer = await ImageComparer.create(verbose: true);
 
   testNoCrashes();
@@ -1034,8 +1032,6 @@ void main() async {
     canvas.restoreToCount(canvas.getSaveCount() + 1);
     expect(canvas.getSaveCount(), equals(6));
   });
-
-  port.close();
 }
 
 Matcher listEquals(ByteData expected) => (dynamic v) {

testing/litetest/lib/src/test.dart

@@ -6,7 +6,7 @@ import 'dart:async';
 import 'dart:io' show stdout;
 import 'dart:isolate';
 
-import 'package:async_helper/async_minitest.dart' as m;
+import 'package:async_helper/async_helper.dart' as m;
 import 'package:expect/expect.dart' as e;
 
 /// The state that each [Test] may be in.
@@ -35,9 +35,8 @@ class Test {
     this.body, {
     StringSink? logger,
     TestLifecycle? lifecycle,
-  }) :
-    _logger = logger ?? stdout,
-    _lifecycle = lifecycle ?? _DefaultTestLifecycle(name);
+  })  : _logger = logger ?? stdout,
+        _lifecycle = lifecycle ?? _DefaultTestLifecycle(name);
 
   /// The name of the test.
   final String name;
@@ -52,30 +51,32 @@ class Test {
   TestState state = TestState.allocated;
 
   final TestLifecycle _lifecycle;
+  final Object _testToken = Object();
 
   /// Runs the test.
   ///
   /// Also signals the test's progress to the [TestLifecycle] object
   /// that was provided when the [Test] was constructed, which will eventually
   /// call the provided [onDone] callback.
-  void run({
+  Future<void> run({
     void Function()? onDone,
-  }) {
-    m.test(name, () async {
-      await Future<void>(() async {
-        state = TestState.started;
-        _logger.writeln('Test "$name": Started');
-        try {
-          await body();
-          state = TestState.succeeded;
-          _logger.writeln('Test "$name": Passed');
-        } on e.ExpectException catch (e, st) {
-          state = TestState.failed;
-          _logger.writeln('Test "$name": Failed\n$e\n$st');
-        } finally {
-          _lifecycle.onDone(cleanup: onDone);
-        }
-      });
+  }) async {
+    m.asyncStart();
+    await Future<void>(() async {
+      state = TestState.started;
+      _logger.writeln('Test "$name": Started');
+      try {
+        await body();
+        state = TestState.succeeded;
+        _logger.writeln('Test "$name": Passed');
+      } on e.ExpectException catch (e, st) {
+        state = TestState.failed;
+        _logger.writeln('Test "$name": Failed\n$e\n$st');
+      } finally {
+        _lifecycle.onDone(cleanup: onDone);
+      }
+    }).then((_) {
+      m.asyncEnd();
     });
     _lifecycle.onStart();
   }

testing/skia_gold_client/lib/skia_gold_client.dart

@@ -248,7 +248,7 @@ class SkiaGoldClient {
       '--work-dir', _tempPath,
       '--test-name', cleanTestName(testName),
       '--png-file', goldenFile.path,
-      // ..._getMatchingArguments(testName, screenshotSize, pixelDeltaThreshold, maxDifferentPixelsRate),
+      ..._getMatchingArguments(testName, screenshotSize, pixelDeltaThreshold, maxDifferentPixelsRate),
     ];
 
     final ProcessResult result = await _runCommand(imgtestCommand);
@@ -344,7 +344,7 @@ class SkiaGoldClient {
       '--work-dir', _tempPath,
       '--test-name', cleanTestName(testName),
       '--png-file', goldenFile.path,
-      // ..._getMatchingArguments(testName, screenshotSize, pixelDeltaThreshold, differentPixelsRate),
+      ..._getMatchingArguments(testName, screenshotSize, pixelDeltaThreshold, differentPixelsRate),
     ];
 
     final ProcessResult result = await _runCommand(tryjobCommand);
@@ -368,29 +368,29 @@ class SkiaGoldClient {
     }
   }
 
-  // List<String> _getMatchingArguments(
-  //   String testName,
-  //   int screenshotSize,
-  //   int pixelDeltaThreshold,
-  //   double differentPixelsRate,
-  // ) {
-  //   // The algorithm to be used when matching images. The available options are:
-  //   // - "fuzzy": Allows for customizing the thresholds of pixel differences.
-  //   // - "sobel": Same as "fuzzy" but performs edge detection before performing
-  //   //            a fuzzy match.
-  //   const String algorithm = 'fuzzy';
-
-  //   // The number of pixels in this image that are allowed to differ from the
-  //   // baseline. It's okay for this to be a slightly high number like 10% of the
-  //   // image size because those wrong pixels are constrained by
-  //   // `pixelDeltaThreshold` below.
-  //   final int maxDifferentPixels = (screenshotSize * differentPixelsRate).toInt();
-  //   return <String>[
-  //     '--add-test-optional-key', 'image_matching_algorithm:$algorithm',
-  //     // '--add-test-optional-key', 'fuzzy_max_different_pixels:$maxDifferentPixels',
-  //     // '--add-test-optional-key', 'fuzzy_pixel_delta_threshold:$pixelDeltaThreshold',
-  //   ];
-  // }
+  List<String> _getMatchingArguments(
+    String testName,
+    int screenshotSize,
+    int pixelDeltaThreshold,
+    double differentPixelsRate,
+  ) {
+    // The algorithm to be used when matching images. The available options are:
+    // - "fuzzy": Allows for customizing the thresholds of pixel differences.
+    // - "sobel": Same as "fuzzy" but performs edge detection before performing
+    //            a fuzzy match.
+    const String algorithm = 'fuzzy';
+
+    // The number of pixels in this image that are allowed to differ from the
+    // baseline. It's okay for this to be a slightly high number like 10% of the
+    // image size because those wrong pixels are constrained by
+    // `pixelDeltaThreshold` below.
+    final int maxDifferentPixels = (screenshotSize * differentPixelsRate).toInt();
+    return <String>[
+      '--add-test-optional-key', 'image_matching_algorithm:$algorithm',
+      '--add-test-optional-key', 'fuzzy_max_different_pixels:$maxDifferentPixels',
+      '--add-test-optional-key', 'fuzzy_pixel_delta_threshold:$pixelDeltaThreshold',
+    ];
+  }
 
   /// Returns the latest positive digest for the given test known to Skia Gold
   /// at head.