Roll engine to version dd6f46c (flutter#15885)

Roll engine to version dd6f46c
gspencergoog · Mar 27, 2018 · 067be92 · 067be92
1 parent d15cc57
commit 067be92
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/bin/internal/engine.version b/bin/internal/engine.version
@@ -1 +1 @@
-6280adbfb1f9f63cdc6179b9b78634add1e4f2e3
+dd6f46c485192f4506035088c9065b9f5dbba9ab
diff --git a/packages/flutter_driver/test/flutter_driver_test.dart b/packages/flutter_driver/test/flutter_driver_test.dart
@@ -29,17 +29,17 @@ void main() {
     void expectLogContains(String message) {
       expect(log.map((LogRecord r) => '$r'), anyElement(contains(message)));
     }
-
+    
     setUp(() {
       log = <LogRecord>[];
       logSub = flutterDriverLog.listen(log.add);
       mockClient = new MockVMServiceClient();
       mockVM = new MockVM();
       mockIsolate = new MockIsolate();
       mockPeer = new MockPeer();
-      when(mockClient.getVM()).thenReturn(mockVM);
+      when(mockClient.getVM()).thenReturn(new Future<MockVM>.value(mockVM));
       when(mockVM.isolates).thenReturn(<VMRunnableIsolate>[mockIsolate]);
-      when(mockIsolate.loadRunnable()).thenReturn(mockIsolate);
+      when(mockIsolate.loadRunnable()).thenReturn(new Future<MockIsolate>.value(mockIsolate));
       when(mockIsolate.invokeExtension(typed(any), typed(any))).thenAnswer(
           (Invocation invocation) => makeMockResponse(<String, dynamic>{'status': 'ok'}));
       vmServiceConnectFunction = (String url) {

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
@@ -31,7 +31,8 @@ void main() {
       const String interface = 'eno1';
       // Adds some extra junk to make sure the strings will be cleaned up.
       when(mockRunner.run(typed(any)))
-          .thenReturn(<String>['123\n\n\n', '456  ', '789']);
+      .thenReturn(new Future<List<String>>.value(
+          <String>['123\n\n\n', '456  ', '789']));
       when(mockRunner.address).thenReturn(address);
       when(mockRunner.interface).thenReturn(interface);
       int port = 0;

diff --git a/packages/fuchsia_remote_debug_protocol/test/src/runners/ssh_command_runner_test.dart b/packages/fuchsia_remote_debug_protocol/test/src/runners/ssh_command_runner_test.dart
@@ -40,7 +40,8 @@ void main() {
     setUp(() {
       mockProcessManager = new MockProcessManager();
       mockProcessResult = new MockProcessResult();
-      when(mockProcessManager.run(typed(any))).thenReturn(mockProcessResult);
+      when(mockProcessManager.run(typed(any))).thenReturn(
+          new Future<MockProcessResult>.value(mockProcessResult));
     });
 
     test('verify interface is appended to ipv6 address', () async {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		6280adbfb1f9f63cdc6179b9b78634add1e4f2e3
		dd6f46c485192f4506035088c9065b9f5dbba9ab