firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix coverage shard and print summary after test run (#28970)

Browse Source 
* Fix coverage shard

* clarify

* Make sure we print test results

* Actually report test results before exiting

* revert unintended changes
This commit is contained in:
Dan Field 2019-03-07 11:31:35 -08:00 committed by GitHub
parent a2d349c4c1
commit f67a529e6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/bots/run_command.dart
View File

@ -37,6 +37,7 @@ Stream<String> runAndGetStdout(String executable, List<String> arguments, {
int expectedExitCode,
String failureMessage,
Duration timeout = _kLongTimeout,
Function beforeExit,
}) async* {
final String commandDescription = '${path.relative(executable, from: workingDirectory)} ${arguments.join(' ')}';
final String relativeWorkingDir = path.relative(workingDirectory);
@ -70,6 +71,7 @@ Stream<String> runAndGetStdout(String executable, List<String> arguments, {
'${bold}Relative working directory:$red $relativeWorkingDir$reset\n'
'$redLine'
);
beforeExit?.call();
exit(1);
}
}

33
dev/bots/test.dart
View File

@ -358,11 +358,15 @@ Future<void> _buildRunnerTest(
pubEnvironment['FLUTTER_TOOL_ARGS'] = toolsArgs.trim();
}
final Stream<String> testOutput = runAndGetStdout(pub, args,
final FlutterCompactFormatter formatter = FlutterCompactFormatter();
final Stream<String> testOutput = runAndGetStdout(
pub,
args,
workingDirectory: workingDirectory,
environment: pubEnvironment,
beforeExit: formatter.finish
);
await _processTestOutput(testOutput, tableData);
await _processTestOutput(formatter, testOutput, tableData);
}
Future<void> _pubRunTest(
@ -388,10 +392,14 @@ Future<void> _pubRunTest(
toolsArgs += ' --enable-asserts';
pubEnvironment['FLUTTER_TOOL_ARGS'] = toolsArgs.trim();
}
final Stream<String> testOutput = runAndGetStdout(pub, args,
final FlutterCompactFormatter formatter = FlutterCompactFormatter();
final Stream<String> testOutput = runAndGetStdout(
pub,
args,
workingDirectory: workingDirectory,
beforeExit: formatter.finish,
);
await _processTestOutput(testOutput, tableData);
await _processTestOutput(formatter, testOutput, tableData);
}
enum CiProviders {
@ -460,9 +468,13 @@ String _getGitHash() {
return '';
}
Future<void> _processTestOutput(Stream<String> testOutput, bq.TabledataResourceApi tableData) async {
final FlutterCompactFormatter formatter = FlutterCompactFormatter();
Future<void> _processTestOutput(
FlutterCompactFormatter formatter,
Stream<String> testOutput,
bq.TabledataResourceApi tableData,
) async {
await testOutput.forEach(formatter.processRawOutput);
formatter.finish();
if (tableData == null || formatter.tests.isEmpty) {
return;
}
@ -538,7 +550,8 @@ Future<void> _runFlutterTest(String workingDirectory, {
if (flutterTestArgs != null && flutterTestArgs.isNotEmpty)
args.addAll(flutterTestArgs);
if (!expectFailure) {
final bool shouldProcessOutput = !expectFailure && !options.contains('--coverage');
if (shouldProcessOutput) {
args.add('--machine');
}
@ -556,7 +569,7 @@ Future<void> _runFlutterTest(String workingDirectory, {
}
args.add(script);
}
if (expectFailure) {
if (!shouldProcessOutput) {
return runCommand(flutter, args,
workingDirectory: workingDirectory,
expectNonZeroExit: true,
@ -565,12 +578,14 @@ Future<void> _runFlutterTest(String workingDirectory, {
timeout: timeout,
);
}
final FlutterCompactFormatter formatter = FlutterCompactFormatter();
final Stream<String> testOutput = runAndGetStdout(flutter, args,
workingDirectory: workingDirectory,
expectNonZeroExit: expectFailure,
timeout: timeout,
beforeExit: formatter.finish,
);
await _processTestOutput(testOutput, tableData);
await _processTestOutput(formatter, testOutput, tableData);
}
Future<void> _verifyVersion(String filename) async {