Index: test/runner/signal_test.dart |
diff --git a/test/runner/signal_test.dart b/test/runner/signal_test.dart |
index e9992c18bcfedcfb6a319068c5d8e9447c85dff7..439a01ddd8fb6f80a9c60f6a3f2d789d09f88012 100644 |
--- a/test/runner/signal_test.dart |
+++ b/test/runner/signal_test.dart |
@@ -10,8 +10,9 @@ import 'dart:convert'; |
import 'dart:io'; |
import 'package:path/path.dart' as p; |
-import 'package:test/test.dart'; |
import 'package:test/src/util/io.dart'; |
+import 'package:test/src/utils.dart'; |
+import 'package:test/test.dart'; |
import '../io.dart'; |
@@ -19,8 +20,6 @@ String _sandbox; |
String get _tempDir => p.join(_sandbox, "tmp"); |
-final _lines = UTF8.decoder.fuse(const LineSplitter()); |
- |
// This test is inherently prone to race conditions. If it fails, it will likely |
// do so flakily, but if it succeeds, it will succeed consistently. The tests |
// represent a best effort to kill the test runner at certain times during its |
@@ -45,7 +44,7 @@ void main() { |
"""); |
var process = await _startTest(["test.dart"]); |
- var line = await _lines.bind(process.stdout).first; |
+ var line = await lineSplitter.bind(process.stdout).first; |
expect(line, equals("in test.dart")); |
process.kill(); |
await process.exitCode; |
@@ -57,7 +56,7 @@ void main() { |
.writeAsStringSync("void main() {}"); |
var process = await _startTest(["-p", "chrome", "test.dart"]); |
- var line = await _lines.bind(process.stdout).first; |
+ var line = await lineSplitter.bind(process.stdout).first; |
expect(line, equals("Compiling test.dart...")); |
process.kill(); |
await process.exitCode; |
@@ -73,7 +72,7 @@ void main() { |
"""); |
var process = await _startTest(["test.dart"]); |
- var line = await _lines.bind(process.stdout).first; |
+ var line = await lineSplitter.bind(process.stdout).first; |
expect(line, equals("in test.dart")); |
process.kill(); |
@@ -106,7 +105,7 @@ void main() { |
"""); |
var process = await _startTest(["test.dart"]); |
- var line = await _lines.bind(process.stdout).skip(2).first; |
+ var line = await lineSplitter.bind(process.stdout).skip(2).first; |
expect(line, equals("running test")); |
process.kill(); |
await process.exitCode; |
@@ -138,7 +137,7 @@ void main() { |
var process = await _startTest(["-p", "content-shell", "test.dart"]); |
// The first line is blank, and the second is a status line from the |
// reporter. |
- var line = await _lines.bind(process.stdout).skip(2).first; |
+ var line = await lineSplitter.bind(process.stdout).skip(2).first; |
expect(line, equals("running test")); |
process.kill(); |
await process.exitCode; |
@@ -158,7 +157,7 @@ void main() { |
"""); |
var process = await _startTest(["test.dart"]); |
- var line = await _lines.bind(process.stdout).skip(2).first; |
+ var line = await lineSplitter.bind(process.stdout).skip(2).first; |
expect(line, equals("running test")); |
process.kill(); |
@@ -198,7 +197,7 @@ void main() { |
"""); |
var process = await _startTest(["test.dart"]); |
- var line = await _lines.bind(process.stdout).skip(2).first; |
+ var line = await lineSplitter.bind(process.stdout).skip(2).first; |
expect(line, equals("running test")); |
process.kill(); |
await process.exitCode; |
@@ -235,7 +234,7 @@ void main() { |
"""); |
var process = await _startTest(["test.dart"]); |
- var line = await _lines.bind(process.stdout).skip(2).first; |
+ var line = await lineSplitter.bind(process.stdout).skip(2).first; |
expect(line, equals("running test")); |
process.kill(); |
await process.exitCode; |