Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
7db73c0a
Unverified
Commit
7db73c0a
authored
Jul 10, 2022
by
Alexander Biggs
Committed by
GitHub
Jul 10, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fuchsia] Change format of ffx call to debug spam. (#105169)
parent
fd315542
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
11 deletions
+34
-11
devices.dart
dev/devicelab/lib/framework/devices.dart
+2
-2
fuchsia_ffx.dart
packages/flutter_tools/lib/src/fuchsia/fuchsia_ffx.dart
+4
-2
fuchsia_ffx_test.dart
...er_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart
+28
-7
No files found.
dev/devicelab/lib/framework/devices.dart
View file @
7db73c0a
...
...
@@ -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
,
]
...
...
packages/flutter_tools/lib/src/fuchsia/fuchsia_ffx.dart
View file @
7db73c0a
...
...
@@ -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
,
];
...
...
packages/flutter_tools/test/general.shard/fuchsia/fuchsia_ffx_test.dart
View file @
7db73c0a
...
...
@@ -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
\n
device2'
,
),
]);
...
...
@@ -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'
,
),
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment