Fixes in modular test runner:

sigmundch · commit-bot@chromium.org · commit 0960f72517b3 · 2019-06-10T22:39:06.000Z
- ensure output directory has a trailing slash - ensure tests complete before returning from runner - flush log files (probably not necessary) TBR=athom@google.com Change-Id: Ie415266fd311d6319e0853a785e867770c0587a0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/105472 Reviewed-by: Sigmund Cherem <sigmund@google.com> Reviewed-by: Alexander Thomas <athom@google.com> Commit-Queue: Sigmund Cherem <sigmund@google.com>
diff --git a/pkg/modular_test/lib/src/generic_runner.dart b/pkg/modular_test/lib/src/generic_runner.dart
@@ -152,8 +152,13 @@ Future<void> runSuite<T>(List<Test> tests, RunnerOptions options) async {
     }
   }
 
-  File.fromUri(options.logDir.resolve('results.json'))
-      .writeAsStringSync(results.map((s) => '$s\n').join());
-  File.fromUri(options.logDir.resolve('logs.json'))
-      .writeAsStringSync(logs.map((s) => '$s\n').join());
+  // Ensure the directory URI ends with a path separator.
+  var logDir = Directory.fromUri(options.logDir).uri;
+  var resultJsonUri = logDir.resolve('results.json');
+  var logsJsonUri = logDir.resolve('logs.json');
+  File.fromUri(resultJsonUri)
+      .writeAsStringSync(results.map((s) => '$s\n').join(), flush: true);
+  File.fromUri(logsJsonUri)
+      .writeAsStringSync(logs.map((s) => '$s\n').join(), flush: true);
+  print('log files emitted to ${resultJsonUri} and ${logsJsonUri}');
 }
diff --git a/pkg/modular_test/lib/src/runner.dart b/pkg/modular_test/lib/src/runner.dart
@@ -24,7 +24,7 @@ Future<void> runSuite(Uri suiteFolder, String suiteName, Options options,
       .map((e) => new _PipelineTest(e.uri, suiteFolder, options, pipeline))
       .toList();
 
-  generic.runSuite(
+  await generic.runSuite(
       entries,
       new generic.RunnerOptions()
         ..suiteName = suiteName

Original file line number	Diff line number	Diff line change
`@@ -152,8 +152,13 @@ Future<void> runSuite<T>(List<Test> tests, RunnerOptions options) async {`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`- File.fromUri(options.logDir.resolve('results.json'))`
`156`		`- .writeAsStringSync(results.map((s) => '$s\n').join());`
`157`		`- File.fromUri(options.logDir.resolve('logs.json'))`
`158`		`- .writeAsStringSync(logs.map((s) => '$s\n').join());`
	`155`	`+ // Ensure the directory URI ends with a path separator.`
	`156`	`+ var logDir = Directory.fromUri(options.logDir).uri;`
	`157`	`+ var resultJsonUri = logDir.resolve('results.json');`
	`158`	`+ var logsJsonUri = logDir.resolve('logs.json');`
	`159`	`+ File.fromUri(resultJsonUri)`
	`160`	`+ .writeAsStringSync(results.map((s) => '$s\n').join(), flush: true);`
	`161`	`+ File.fromUri(logsJsonUri)`
	`162`	`+ .writeAsStringSync(logs.map((s) => '$s\n').join(), flush: true);`
	`163`	`+ print('log files emitted to ${resultJsonUri} and ${logsJsonUri}');`
`159`	`164`	`}`