Unverified Commit a217ab60 authored by Jonah Williams's avatar Jonah Williams Committed by GitHub

[flutter_tools] remove getLocalEngineArtifacts from integration tests that cant use it (#83282)

parent b1992c16
...@@ -11,6 +11,9 @@ import 'package:flutter_tools/src/base/io.dart'; ...@@ -11,6 +11,9 @@ import 'package:flutter_tools/src/base/io.dart';
import '../src/common.dart'; import '../src/common.dart';
import 'test_utils.dart'; import 'test_utils.dart';
// This test file does not use [getLocalEngineArguments] because it requires
// multiple specific artifact output types.
const String apkDebugMessage = 'A summary of your APK analysis can be found at: '; const String apkDebugMessage = 'A summary of your APK analysis can be found at: ';
const String iosDebugMessage = 'A summary of your iOS bundle analysis can be found at: '; const String iosDebugMessage = 'A summary of your iOS bundle analysis can be found at: ';
const String runDevToolsMessage = 'flutter pub global activate devtools; flutter pub global run devtools '; const String runDevToolsMessage = 'flutter pub global activate devtools; flutter pub global run devtools ';
...@@ -21,7 +24,6 @@ void main() { ...@@ -21,7 +24,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'build', 'build',
'apk', 'apk',
'--analyze-size', '--analyze-size',
...@@ -55,7 +57,6 @@ void main() { ...@@ -55,7 +57,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'build', 'build',
'ios', 'ios',
'--analyze-size', '--analyze-size',
...@@ -87,7 +88,6 @@ void main() { ...@@ -87,7 +88,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'build', 'build',
'apk', 'apk',
'--analyze-size', '--analyze-size',
...@@ -106,7 +106,6 @@ void main() { ...@@ -106,7 +106,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'build', 'build',
'apk', 'apk',
'--analyze-size', '--analyze-size',
...@@ -125,7 +124,6 @@ void main() { ...@@ -125,7 +124,6 @@ void main() {
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'build', 'build',
'apk', 'apk',
'--analyze-size', '--analyze-size',
......
...@@ -13,12 +13,14 @@ import 'package:flutter_tools/src/features.dart'; ...@@ -13,12 +13,14 @@ import 'package:flutter_tools/src/features.dart';
import '../src/common.dart'; import '../src/common.dart';
import 'test_utils.dart'; import 'test_utils.dart';
// This test file does not use [getLocalEngineArguments] because it is testing
// command output and not using cached artifacts.
void main() { void main() {
testWithoutContext('All development tools and deprecated commands are hidden and help text is not verbose', () async { testWithoutContext('All development tools and deprecated commands are hidden and help text is not verbose', () async {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'-h', '-h',
'-v', '-v',
]); ]);
...@@ -37,7 +39,6 @@ void main() { ...@@ -37,7 +39,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'-?', '-?',
]); ]);
...@@ -52,7 +53,6 @@ void main() { ...@@ -52,7 +53,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'doctor', 'doctor',
'-v', '-v',
]); ]);
...@@ -65,7 +65,6 @@ void main() { ...@@ -65,7 +65,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'doctor', 'doctor',
'-vv', '-vv',
]); ]);
...@@ -78,7 +77,6 @@ void main() { ...@@ -78,7 +77,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'config', 'config',
]); ]);
...@@ -108,7 +106,6 @@ void main() { ...@@ -108,7 +106,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'run', 'run',
'--show-test-device', // ensure command can fail to run and hit injection of correct logger. '--show-test-device', // ensure command can fail to run and hit injection of correct logger.
'--machine', '--machine',
...@@ -125,7 +122,6 @@ void main() { ...@@ -125,7 +122,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'attach', 'attach',
'--machine', '--machine',
'-v', '-v',
...@@ -138,7 +134,6 @@ void main() { ...@@ -138,7 +134,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'--version', '--version',
'--machine', '--machine',
]); ]);
...@@ -158,7 +153,6 @@ void main() { ...@@ -158,7 +153,6 @@ void main() {
final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'--show-test-device', '--show-test-device',
'attach', 'attach',
'-d', '-d',
...@@ -176,7 +170,6 @@ void main() { ...@@ -176,7 +170,6 @@ void main() {
final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'--show-test-device', '--show-test-device',
'attach', 'attach',
'-d', '-d',
...@@ -202,7 +195,6 @@ void main() { ...@@ -202,7 +195,6 @@ void main() {
bootstrap.writeAsStringSync('echo TESTING 1 2 3'); bootstrap.writeAsStringSync('echo TESTING 1 2 3');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
]); ]);
expect(result.stdout, contains('TESTING 1 2 3')); expect(result.stdout, contains('TESTING 1 2 3'));
...@@ -216,7 +208,6 @@ void main() { ...@@ -216,7 +208,6 @@ void main() {
final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'build', 'build',
'apk', 'apk',
'--bundle-sksl-path=foo/bar/baz.json', // This file does not exist. '--bundle-sksl-path=foo/bar/baz.json', // This file does not exist.
...@@ -231,7 +222,6 @@ void main() { ...@@ -231,7 +222,6 @@ void main() {
final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world'); final String helloWorld = fileSystem.path.join(getFlutterRoot(), 'examples', 'hello_world');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'--show-test-device', '--show-test-device',
'attach', 'attach',
'--release', '--release',
...@@ -245,7 +235,6 @@ void main() { ...@@ -245,7 +235,6 @@ void main() {
final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter'); final String flutterBin = fileSystem.path.join(getFlutterRoot(), 'bin', 'flutter');
final ProcessResult result = await processManager.run(<String>[ final ProcessResult result = await processManager.run(<String>[
flutterBin, flutterBin,
...getLocalEngineArguments(),
'update-packages', 'update-packages',
'--crash', '--crash',
], environment: <String, String>{ ], environment: <String, String>{
......
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