From 3d6da4926036c4cb9818da5c25bb122d42c3b12a Mon Sep 17 00:00:00 2001
From: Gary Roumanis <groumanis@gmail.com>
Date: Mon, 11 Jun 2018 16:08:33 -0700
Subject: [PATCH] Fixes for latest SDK (dev.61 - default sync-async) (#864)
---
.travis.yml | 2 +-
lib/src/runner/engine.dart | 2 ++
test/runner/compact_reporter_test.dart | 2 +-
test/runner/configuration/top_level_test.dart | 2 +-
test/runner/expanded_reporter_test.dart | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 2ed895fc..7aae45cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ language: dart
sudo: required
dart:
- - 2.0.0-dev.60.0
+ - dev
env: FORCE_TEST_EXIT=true
diff --git a/lib/src/runner/engine.dart b/lib/src/runner/engine.dart
index 08f4d66f..65965d91 100644
--- a/lib/src/runner/engine.dart
+++ b/lib/src/runner/engine.dart
@@ -527,6 +527,8 @@ class Engine {
/// Closing [suiteSink] indicates that no more input will be provided, closing
/// the engine indicates that no more output should be emitted.
Future close() async {
+ // TODO(grouma) - Remove this unecessary await.
+ await new Future(() {});
_closed = true;
if (_closedBeforeDone != null) _closedBeforeDone = true;
_onSuiteAddedController.close();
diff --git a/test/runner/compact_reporter_test.dart b/test/runner/compact_reporter_test.dart
index 39a92f7a..9e3969b3 100644
--- a/test/runner/compact_reporter_test.dart
+++ b/test/runner/compact_reporter_test.dart
@@ -76,7 +76,7 @@ void main() {
var test =
await runTest(["--verbose-trace", "test.dart"], reporter: "compact");
- expect(test.stdout, emitsThrough(contains("dart:isolate-patch")));
+ expect(test.stdout, emitsThrough(contains("dart:async")));
await test.shouldExit(1);
});
diff --git a/test/runner/configuration/top_level_test.dart b/test/runner/configuration/top_level_test.dart
index bcfd811f..383f679e 100644
--- a/test/runner/configuration/top_level_test.dart
+++ b/test/runner/configuration/top_level_test.dart
@@ -129,7 +129,7 @@ void main() {
""").create();
var test = await runTest(["test.dart"]);
- expect(test.stdout, emitsThrough(contains("dart:isolate-patch")));
+ expect(test.stdout, emitsThrough(contains("dart:async")));
await test.shouldExit(1);
});
diff --git a/test/runner/expanded_reporter_test.dart b/test/runner/expanded_reporter_test.dart
index ab18880e..ae7f200a 100644
--- a/test/runner/expanded_reporter_test.dart
+++ b/test/runner/expanded_reporter_test.dart
@@ -67,7 +67,7 @@ void main() {
""").create();
var test = await runTest(["--verbose-trace", "test.dart"]);
- expect(test.stdout, emitsThrough(contains("dart:isolate-patch")));
+ expect(test.stdout, emitsThrough(contains("dart:async")));
await test.shouldExit(1);
});
--
GitLab