Unverified Commit 2b20345b authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

use pub run for create test and remove [INFO] logs (#35839)

parent e3a08d23
...@@ -87,6 +87,7 @@ Future<void> runCommand(String executable, List<String> arguments, { ...@@ -87,6 +87,7 @@ Future<void> runCommand(String executable, List<String> arguments, {
bool skip = false, bool skip = false,
bool expectFlaky = false, bool expectFlaky = false,
Duration timeout = _kLongTimeout, Duration timeout = _kLongTimeout,
bool Function(String) removeLine,
}) async { }) async {
final String commandDescription = '${path.relative(executable, from: workingDirectory)} ${arguments.join(' ')}'; final String commandDescription = '${path.relative(executable, from: workingDirectory)} ${arguments.join(' ')}';
final String relativeWorkingDir = path.relative(workingDirectory); final String relativeWorkingDir = path.relative(workingDirectory);
...@@ -103,13 +104,18 @@ Future<void> runCommand(String executable, List<String> arguments, { ...@@ -103,13 +104,18 @@ Future<void> runCommand(String executable, List<String> arguments, {
); );
Future<List<List<int>>> savedStdout, savedStderr; Future<List<List<int>>> savedStdout, savedStderr;
final Stream<List<int>> stdoutSource = process.stdout
.transform<String>(const Utf8Decoder())
.transform(const LineSplitter())
.where((String line) => removeLine == null || !removeLine(line))
.transform(const Utf8Encoder());
if (printOutput) { if (printOutput) {
await Future.wait<void>(<Future<void>>[ await Future.wait<void>(<Future<void>>[
stdout.addStream(process.stdout), stdout.addStream(stdoutSource),
stderr.addStream(process.stderr), stderr.addStream(process.stderr),
]); ]);
} else { } else {
savedStdout = process.stdout.toList(); savedStdout = stdoutSource.toList();
savedStderr = process.stderr.toList(); savedStderr = process.stderr.toList();
} }
......
...@@ -240,7 +240,8 @@ Future<void> _runToolTests() async { ...@@ -240,7 +240,8 @@ Future<void> _runToolTests() async {
File(path.join(flutterRoot, 'bin', 'cache', 'flutter_tools.snapshot')).deleteSync(); File(path.join(flutterRoot, 'bin', 'cache', 'flutter_tools.snapshot')).deleteSync();
File(path.join(flutterRoot, 'bin', 'cache', 'flutter_tools.stamp')).deleteSync(); File(path.join(flutterRoot, 'bin', 'cache', 'flutter_tools.stamp')).deleteSync();
} }
if (noUseBuildRunner) { // reduce overhead of build_runner in the create case.
if (noUseBuildRunner || Platform.environment['SUBSHARD'] == 'create') {
await _pubRunTest( await _pubRunTest(
path.join(flutterRoot, 'packages', 'flutter_tools'), path.join(flutterRoot, 'packages', 'flutter_tools'),
tableData: bigqueryApi?.tabledata, tableData: bigqueryApi?.tabledata,
...@@ -591,6 +592,9 @@ Future<void> _pubRunTest( ...@@ -591,6 +592,9 @@ Future<void> _pubRunTest(
case 'tool': case 'tool':
args.addAll(<String>['--exclude-tags', 'integration']); args.addAll(<String>['--exclude-tags', 'integration']);
break; break;
case 'create':
args.addAll(<String>[path.join('test', 'commands', 'create_test.dart')]);
break;
} }
if (useFlutterTestFormatter) { if (useFlutterTestFormatter) {
...@@ -606,7 +610,7 @@ Future<void> _pubRunTest( ...@@ -606,7 +610,7 @@ Future<void> _pubRunTest(
await runCommand( await runCommand(
pub, pub,
args, args,
workingDirectory:workingDirectory, workingDirectory: workingDirectory,
); );
} }
} }
......
tags:
"no_coverage":
"create":
"integration":
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment