github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fuchsia] Change format of ffx call to debug spam. (#105169)

Browse Source
This commit is contained in:
Alexander Biggs 2022-07-10 15:51:06 -07:00 committed by GitHub
parent fd31554265
commit 7db73c0a93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/devicelab/lib/framework/devices.dart
View File

@ -482,7 +482,7 @@ class FuchsiaDeviceDiscovery implements DeviceDiscovery {
@override
Future<List<String>> discoverDevices() async {
final List<String> output = (await eval(_ffx, <String>['target', 'list', '--format', 's']))
final List<String> output = (await eval(_ffx, <String>['target', 'list', '-f', 's']))
.trim()
.split('\n');
@ -505,7 +505,7 @@ class FuchsiaDeviceDiscovery implements DeviceDiscovery {
<String>[
'target',
'list',
'--format',
'-f',
'a',
deviceId,
]

6
packages/flutter_tools/lib/src/fuchsia/fuchsia_ffx.dart
View File

@ -57,7 +57,9 @@ class FuchsiaFfx {
...<String>['-T', '${timeout.inSeconds}'],
'target',
'list',
'--format',
// TODO(akbiggs): Revert -f back to --format once we've verified that
// analytics spam is coming from here.
'-f',
's',
];
final RunResult result = await _processUtils.run(command);
@ -84,7 +86,7 @@ class FuchsiaFfx {
ffx.path,
'target',
'list',
'--format',
'-f',
'a',
deviceName,
];

35
packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart
View File

@ -45,7 +45,7 @@ void main() {
final ProcessManager processManager =
FakeProcessManager.list(<FakeCommand>[
FakeCommand(
command: <String>[ffx.path, 'target', 'list', '--format', 's'],
command: <String>[ffx.path, 'target', 'list', '-f', 's'],
stderr: 'No devices found.',
),
]);
@ -66,7 +66,7 @@ void main() {
final ProcessManager processManager =
FakeProcessManager.list(<FakeCommand>[
FakeCommand(
command: <String>[ffx.path, 'target', 'list', '--format', 's'],
command: <String>[ffx.path, 'target', 'list', '-f', 's'],
exitCode: 1,
stderr: 'unexpected error',
),
@ -88,7 +88,7 @@ void main() {
final ProcessManager processManager =
FakeProcessManager.list(<FakeCommand>[
FakeCommand(
command: <String>[ffx.path, 'target', 'list', '--format', 's'],
command: <String>[ffx.path, 'target', 'list', '-f', 's'],
stdout: 'device1\ndevice2',
),
]);
@ -109,7 +109,7 @@ void main() {
final ProcessManager processManager =
FakeProcessManager.list(<FakeCommand>[
FakeCommand(
command: <String>[ffx.path, '-T', '2', 'target', 'list', '--format', 's'],
command: <String>[ffx.path, '-T', '2', 'target', 'list', '-f', 's'],
stdout: 'device1',
),
]);
@ -143,7 +143,14 @@ void main() {
final ProcessManager processManager =
FakeProcessManager.list(<FakeCommand>[
FakeCommand(
command: <String>[ffx.path, 'target', 'list', '--format', 'a', 'unknown-device'],
command: <String>[
ffx.path,
'target',
'list',
'-f',
'a',
'unknown-device'
],
exitCode: 2,
stderr: 'No devices found.',
),
@ -165,7 +172,14 @@ void main() {
final ProcessManager processManager =
FakeProcessManager.list(<FakeCommand>[
FakeCommand(
command: <String>[ffx.path, 'target', 'list', '--format', 'a', 'error-device'],
command: <String>[
ffx.path,
'target',
'list',
'-f',
'a',
'error-device'
],
exitCode: 1,
stderr: 'unexpected error',
),
@ -187,7 +201,14 @@ void main() {
final ProcessManager processManager =
FakeProcessManager.list(<FakeCommand>[
FakeCommand(
command: <String>[ffx.path, 'target', 'list', '--format', 'a', 'known-device'],
command: <String>[
ffx.path,
'target',
'list',
'-f',
'a',
'known-device'
],
stdout: '1234-1234-1234-1234',
),
]);