Skip to content

Commit 509a953

Browse files
akbiggscamsim99
authored andcommitted
[fuchsia] Change format of ffx call to debug spam. (flutter#105169)
1 parent 1aa4525 commit 509a953

File tree

3 files changed

+34
-11
lines changed

3 files changed

+34
-11
lines changed

dev/devicelab/lib/framework/devices.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ class FuchsiaDeviceDiscovery implements DeviceDiscovery {
482482

483483
@override
484484
Future<List<String>> discoverDevices() async {
485-
final List<String> output = (await eval(_ffx, <String>['target', 'list', '--format', 's']))
485+
final List<String> output = (await eval(_ffx, <String>['target', 'list', '-f', 's']))
486486
.trim()
487487
.split('\n');
488488

@@ -505,7 +505,7 @@ class FuchsiaDeviceDiscovery implements DeviceDiscovery {
505505
<String>[
506506
'target',
507507
'list',
508-
'--format',
508+
'-f',
509509
'a',
510510
deviceId,
511511
]

packages/flutter_tools/lib/src/fuchsia/fuchsia_ffx.dart

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ class FuchsiaFfx {
5757
...<String>['-T', '${timeout.inSeconds}'],
5858
'target',
5959
'list',
60-
'--format',
60+
// TODO(akbiggs): Revert -f back to --format once we've verified that
61+
// analytics spam is coming from here.
62+
'-f',
6163
's',
6264
];
6365
final RunResult result = await _processUtils.run(command);
@@ -84,7 +86,7 @@ class FuchsiaFfx {
8486
ffx.path,
8587
'target',
8688
'list',
87-
'--format',
89+
'-f',
8890
'a',
8991
deviceName,
9092
];

packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void main() {
4545
final ProcessManager processManager =
4646
FakeProcessManager.list(<FakeCommand>[
4747
FakeCommand(
48-
command: <String>[ffx.path, 'target', 'list', '--format', 's'],
48+
command: <String>[ffx.path, 'target', 'list', '-f', 's'],
4949
stderr: 'No devices found.',
5050
),
5151
]);
@@ -66,7 +66,7 @@ void main() {
6666
final ProcessManager processManager =
6767
FakeProcessManager.list(<FakeCommand>[
6868
FakeCommand(
69-
command: <String>[ffx.path, 'target', 'list', '--format', 's'],
69+
command: <String>[ffx.path, 'target', 'list', '-f', 's'],
7070
exitCode: 1,
7171
stderr: 'unexpected error',
7272
),
@@ -88,7 +88,7 @@ void main() {
8888
final ProcessManager processManager =
8989
FakeProcessManager.list(<FakeCommand>[
9090
FakeCommand(
91-
command: <String>[ffx.path, 'target', 'list', '--format', 's'],
91+
command: <String>[ffx.path, 'target', 'list', '-f', 's'],
9292
stdout: 'device1\ndevice2',
9393
),
9494
]);
@@ -109,7 +109,7 @@ void main() {
109109
final ProcessManager processManager =
110110
FakeProcessManager.list(<FakeCommand>[
111111
FakeCommand(
112-
command: <String>[ffx.path, '-T', '2', 'target', 'list', '--format', 's'],
112+
command: <String>[ffx.path, '-T', '2', 'target', 'list', '-f', 's'],
113113
stdout: 'device1',
114114
),
115115
]);
@@ -143,7 +143,14 @@ void main() {
143143
final ProcessManager processManager =
144144
FakeProcessManager.list(<FakeCommand>[
145145
FakeCommand(
146-
command: <String>[ffx.path, 'target', 'list', '--format', 'a', 'unknown-device'],
146+
command: <String>[
147+
ffx.path,
148+
'target',
149+
'list',
150+
'-f',
151+
'a',
152+
'unknown-device'
153+
],
147154
exitCode: 2,
148155
stderr: 'No devices found.',
149156
),
@@ -165,7 +172,14 @@ void main() {
165172
final ProcessManager processManager =
166173
FakeProcessManager.list(<FakeCommand>[
167174
FakeCommand(
168-
command: <String>[ffx.path, 'target', 'list', '--format', 'a', 'error-device'],
175+
command: <String>[
176+
ffx.path,
177+
'target',
178+
'list',
179+
'-f',
180+
'a',
181+
'error-device'
182+
],
169183
exitCode: 1,
170184
stderr: 'unexpected error',
171185
),
@@ -187,7 +201,14 @@ void main() {
187201
final ProcessManager processManager =
188202
FakeProcessManager.list(<FakeCommand>[
189203
FakeCommand(
190-
command: <String>[ffx.path, 'target', 'list', '--format', 'a', 'known-device'],
204+
command: <String>[
205+
ffx.path,
206+
'target',
207+
'list',
208+
'-f',
209+
'a',
210+
'known-device'
211+
],
191212
stdout: '1234-1234-1234-1234',
192213
),
193214
]);

0 commit comments

Comments
 (0)