firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[frdp] Adds paths for find and ls for Fuchsia execution. (#26680)

Browse Source 
Adds full path for `find` and `ls` commands.
This commit is contained in:
Andrew Davies 2019-01-22 10:49:17 -08:00 committed by GitHub
parent f777db2b78
commit 33cd720db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart
View File

@ -523,14 +523,15 @@ class FuchsiaRemoteConnection {
/// found. An exception is thrown in the event of an actual error when /// found. An exception is thrown in the event of an actual error when
/// attempting to acquire the ports. /// attempting to acquire the ports.
Future<List<int>> getDeviceServicePorts() async { Future<List<int>> getDeviceServicePorts() async {
final List<String> portPaths = final List<String> portPaths = await _sshCommandRunner
await _sshCommandRunner.run('find /hub -name vmservice-port'); .run('/system/bin/find /hub -name vmservice-port');
final List<int> ports = <int>[]; final List<int> ports = <int>[];
for (String path in portPaths) { for (String path in portPaths) {
if (path == '') { if (path == '') {
continue; continue;
} }
final List<String> lsOutput = await _sshCommandRunner.run('ls $path'); final List<String> lsOutput =
await _sshCommandRunner.run('/system/bin/ls $path');
for (String line in lsOutput) { for (String line in lsOutput) {
if (line == '') { if (line == '') {
continue; continue;

10
packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart
View File

@ -21,10 +21,12 @@ void main() {
setUp(() { setUp(() {
mockRunner = MockSshCommandRunner(); mockRunner = MockSshCommandRunner();
// Adds some extra junk to make sure the strings will be cleaned up. // Adds some extra junk to make sure the strings will be cleaned up.
when(mockRunner.run(argThat(startsWith('find')))).thenAnswer((_) => when(mockRunner.run(argThat(startsWith('/system/bin/find')))).thenAnswer(
Future<List<String>>.value(<String>['/hub/blah/blah/blah/vmservice-port\n'])); (_) => Future<List<String>>.value(
when(mockRunner.run(argThat(startsWith('ls')))).thenAnswer((_) => <String>['/hub/blah/blah/blah/vmservice-port\n']));
Future<List<String>>.value(<String>['123\n\n\n', '456 ', '789'])); when(mockRunner.run(argThat(startsWith('/system/bin/ls')))).thenAnswer(
(_) => Future<List<String>>.value(
<String>['123\n\n\n', '456 ', '789']));
const String address = 'fe80::8eae:4cff:fef4:9247'; const String address = 'fe80::8eae:4cff:fef4:9247';
const String interface = 'eno1'; const String interface = 'eno1';
when(mockRunner.address).thenReturn(address); when(mockRunner.address).thenReturn(address);