From ea4cffde6026c3196096d8b22a91f0400fc63cae Mon Sep 17 00:00:00 2001 From: Zachary Anderson Date: Fri, 22 Feb 2019 08:38:02 -0800 Subject: [PATCH] [fuchsia] Fix paths to find and ls (#28280) --- .../lib/src/fuchsia_remote_connection.dart | 4 ++-- .../test/fuchsia_remote_connection_test.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart b/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart index adcd157bf6..99b06e6004 100644 --- a/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart +++ b/packages/fuchsia_remote_debug_protocol/lib/src/fuchsia_remote_connection.dart @@ -526,14 +526,14 @@ class FuchsiaRemoteConnection { /// attempting to acquire the ports. Future> getDeviceServicePorts() async { final List portPaths = await _sshCommandRunner - .run('/system/bin/find /hub -name vmservice-port'); + .run('/bin/find /hub -name vmservice-port'); final List ports = []; for (String path in portPaths) { if (path == '') { continue; } final List lsOutput = - await _sshCommandRunner.run('/system/bin/ls $path'); + await _sshCommandRunner.run('/bin/ls $path'); for (String line in lsOutput) { if (line == '') { continue; diff --git a/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart b/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart index 4204e66c4d..66c4813614 100644 --- a/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart +++ b/packages/fuchsia_remote_debug_protocol/test/fuchsia_remote_connection_test.dart @@ -21,10 +21,10 @@ void main() { setUp(() { mockRunner = MockSshCommandRunner(); // Adds some extra junk to make sure the strings will be cleaned up. - when(mockRunner.run(argThat(startsWith('/system/bin/find')))).thenAnswer( + when(mockRunner.run(argThat(startsWith('/bin/find')))).thenAnswer( (_) => Future>.value( ['/hub/blah/blah/blah/vmservice-port\n'])); - when(mockRunner.run(argThat(startsWith('/system/bin/ls')))).thenAnswer( + when(mockRunner.run(argThat(startsWith('/bin/ls')))).thenAnswer( (_) => Future>.value( ['123\n\n\n', '456 ', '789'])); const String address = 'fe80::8eae:4cff:fef4:9247';