Merge branch 'master' of https://github.com/flutter/flutter

Author: gspencergoog

bin/internal/engine.version

@@ -1 +1 @@
-c757fc74512fe9039a31e194906bf3700b4c1319
+5fcfb995bbce72b5f1ee807121f51a3c0280c8b4

bin/internal/update_dart_sdk.ps1

@@ -40,8 +40,13 @@ if (Test-Path $dartSdkPath) {
 }
 New-Item $dartSdkPath -force -type directory | Out-Null
 $dartSdkZip = "$cachePath\dart-sdk.zip"
-Import-Module BitsTransfer
-Start-BitsTransfer -Source $dartSdkUrl -Destination $dartSdkZip
+# TODO(goderbauer): remove (slow and backwards-incompatible) appveyor work around
+if (Test-Path Env:\APPVEYOR) {
+    curl $dartSdkUrl -OutFile $dartSdkZip
+} else {
+    Import-Module BitsTransfer
+    Start-BitsTransfer -Source $dartSdkUrl -Destination $dartSdkZip
+}
 
 Write-Host "Unzipping Dart SDK..."
 If (Get-Command 7z -errorAction SilentlyContinue) {

dev/devicelab/bin/tasks/commands_test.dart

@@ -0,0 +1,93 @@
+// Copyright (c) 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:path/path.dart' as path;
+
+import 'package:flutter_devicelab/framework/adb.dart';
+import 'package:flutter_devicelab/framework/framework.dart';
+import 'package:flutter_devicelab/framework/utils.dart';
+
+void main() {
+  task(() async {
+    final Device device = await devices.workingDevice;
+    await device.unlock();
+    final Directory appDir = dir(path.join(flutterDirectory.path, 'dev/integration_tests/ui'));
+    await inDirectory(appDir, () async {
+      final Completer<Null> ready = new Completer<Null>();
+      bool ok;
+      print('run: starting...');
+      final Process run = await startProcess(
+        path.join(flutterDirectory.path, 'bin', 'flutter'),
+        <String>['run', '--verbose', '--observatory-port=8888', '-d', device.deviceId, 'lib/commands.dart'],
+      );
+      run.stdout
+        .transform(UTF8.decoder)
+        .transform(const LineSplitter())
+        .listen((String line) {
+          print('run:stdout: $line');
+          if (line.contains(new RegExp(r'^\[\s+\] For a more detailed help message, press "h"\. To quit, press "q"\.'))) {
+            print('run: ready!');
+            ready.complete();
+            ok ??= true;
+          }
+        });
+      run.stderr
+        .transform(UTF8.decoder)
+        .transform(const LineSplitter())
+        .listen((String line) {
+          stderr.writeln('run:stderr: $line');
+        });
+      run.exitCode.then((int exitCode) { ok = false; });
+      await Future.any<dynamic>(<Future<dynamic>>[ ready.future, run.exitCode ]);
+      if (!ok)
+        throw 'Failed to run test app.';
+      await drive('none');
+      print('test: pressing "p" to enable debugPaintSize...');
+      run.stdin.write('p');
+      await drive('debug_paint');
+      print('test: pressing "p" again...');
+      run.stdin.write('p');
+      await drive('none');
+      print('test: pressing "P" to enable performance overlay...');
+      run.stdin.write('P');
+      await drive('performance_overlay');
+      print('test: pressing "P" again...');
+      run.stdin.write('P');
+      await drive('none');
+      run.stdin.write('q');
+      final int result = await run.exitCode;
+      if (result != 0)
+        throw 'Received unexpected exit code $result from run process.';
+    });
+    return new TaskResult.success(null);
+  });
+}
+
+Future<Null> drive(String name) async {
+  print('drive: running commands_$name check...');
+  final Process drive = await startProcess(
+    path.join(flutterDirectory.path, 'bin', 'flutter'),
+    <String>['drive', '--use-existing-app', 'http://127.0.0.1:8888/', '--keep-app-running', '--driver', 'test_driver/commands_${name}_test.dart'],
+  );
+  drive.stdout
+    .transform(UTF8.decoder)
+    .transform(const LineSplitter())
+    .listen((String line) {
+      print('drive:stdout: $line');
+    });
+  drive.stderr
+    .transform(UTF8.decoder)
+    .transform(const LineSplitter())
+    .listen((String line) {
+      stderr.writeln('drive:stderr: $line');
+    });
+  final int result = await drive.exitCode;
+  if (result != 0)
+    throw 'Failed to drive test app (exit code $result).';
+  print('drive: finished commands_$name check successfully.');
+}

dev/devicelab/lib/framework/framework.dart

@@ -134,7 +134,8 @@ class _TaskRunner {
       // are catching errors coming from arbitrary (and untrustworthy) task
       // code. Our goal is to convert the failure into a readable message.
       // Propagating it further is not useful.
-      completer.complete(new TaskResult.failure(message));
+      if (!completer.isCompleted)
+        completer.complete(new TaskResult.failure(message));
     });
     return completer.future;
   }

dev/devicelab/manifest.yaml

@@ -114,6 +114,13 @@ tasks:
     stage: devicelab
     required_agent_capabilities: ["has-android-device"]
 
+  commands_test:
+    description: >
+      Runs tests of flutter run commands.
+    stage: devicelab
+    required_agent_capabilities: ["has-android-device"]
+    flaky: true
+
   android_sample_catalog_generator:
     description: >
       Builds sample catalog markdown pages and Android screenshots
@@ -131,7 +138,6 @@ tasks:
       Verifies that `flutter drive --route` still works. No performance numbers.
     stage: devicelab
     required_agent_capabilities: ["linux/android"]
-    flaky: true
 
   flutter_gallery_instrumentation_test:
     description: >
@@ -140,7 +146,6 @@ tasks:
       test can run on off-the-shelf infrastructures, such as Firebase Test Lab.
     stage: devicelab
     required_agent_capabilities: ["linux/android"]
-    flaky: true
 
   # iOS on-device tests
 
@@ -149,22 +154,19 @@ tasks:
       Checks that platform channels work on iOS.
     stage: devicelab_ios
     required_agent_capabilities: ["has-ios-device"]
-    flaky: true
 
   platform_channel_sample_test_ios:
     description: >
       Runs a driver test on the Platform Channel sample app on iOS.
     stage: devicelab_ios
     required_agent_capabilities: ["has-ios-device"]
-    flaky: true
 
   complex_layout_scroll_perf_ios__timeline_summary:
     description: >
       Measures the runtime performance of the Complex Layout sample app on
       iOS.
     stage: devicelab_ios
     required_agent_capabilities: ["has-ios-device"]
-    flaky: true
 
 #  flutter_gallery_ios__start_up:
 #    description: >
@@ -186,14 +188,12 @@ tasks:
       iOS.
     stage: devicelab_ios
     required_agent_capabilities: ["has-ios-device"]
-    flaky: true
 
   basic_material_app_ios__size:
     description: >
       Measures the IPA size of a basic material app.
     stage: devicelab_ios
     required_agent_capabilities: ["has-ios-device"]
-    flaky: true
 
 #  microbenchmarks_ios:
 #    description: >
@@ -215,14 +215,12 @@ tasks:
       Runs end-to-end Flutter tests on iOS.
     stage: devicelab_ios
     required_agent_capabilities: ["has-ios-device"]
-    flaky: true
 
   ios_sample_catalog_generator:
     description: >
       Builds sample catalog markdown pages and iOS screenshots
     stage: devicelab_ios
     required_agent_capabilities: ["has-ios-device"]
-    flaky: true
 
   # Tests running on Windows host
 

dev/integration_tests/ui/lib/commands.dart

@@ -0,0 +1,43 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_driver/driver_extension.dart';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/rendering.dart';
+
+String log = '';
+
+void main() {
+  enableFlutterDriverExtension(handler: (String message) async {
+    log = 'log:';
+    await WidgetsBinding.instance.reassembleApplication();
+    return log;
+  });
+  runApp(new MaterialApp(home: const Test()));
+}
+
+class Test extends SingleChildRenderObjectWidget {
+  const Test({ Key key }) : super(key: key);
+
+  @override
+  RenderTest createRenderObject(BuildContext context) {
+    return new RenderTest();
+  }
+}
+
+class RenderTest extends RenderProxyBox {
+  RenderTest({ RenderBox child }) : super(child);
+
+  @override
+  void debugPaintSize(PaintingContext context, Offset offset) {
+    super.debugPaintSize(context, offset);
+    log += ' debugPaintSize';
+  }
+
+  @override
+  void paint(PaintingContext context, Offset offset) {
+    log += ' paint';
+  }
+}

dev/integration_tests/ui/test_driver/commands_debug_paint_test.dart

@@ -0,0 +1,22 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:test/test.dart';
+
+void main() {
+  FlutterDriver driver;
+
+  setUpAll(() async {
+    driver = await FlutterDriver.connect();
+  });
+
+  tearDownAll(() async {
+    driver?.close();
+  });
+
+  test('check that we are painting in debugPaintSize mode', () async {
+    expect(await driver.requestData('status'), 'log: paint debugPaintSize');
+  });
+}

dev/integration_tests/ui/test_driver/commands_none_test.dart

@@ -0,0 +1,23 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:test/test.dart';
+
+void main() {
+  FlutterDriver driver;
+
+  setUpAll(() async {
+    driver = await FlutterDriver.connect();
+  });
+
+  tearDownAll(() async {
+    driver?.close();
+  });
+
+  test('check that we are in normal mode', () async {
+    expect(await driver.requestData('status'), 'log: paint');
+    await driver.waitForAbsent(find.byType('PerformanceOverlay'), timeout: Duration.ZERO);
+  });
+}

dev/integration_tests/ui/test_driver/commands_performance_overlay_test.dart

@@ -0,0 +1,23 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'package:flutter_driver/flutter_driver.dart';
+import 'package:test/test.dart';
+
+void main() {
+  FlutterDriver driver;
+
+  setUpAll(() async {
+    driver = await FlutterDriver.connect();
+  });
+
+  tearDownAll(() async {
+    driver?.close();
+  });
+
+  test('check that we are showing the performance overlay', () async {
+    await driver.requestData('status'); // force a reassemble
+    await driver.waitFor(find.byType('PerformanceOverlay'), timeout: Duration.ZERO);
+  });
+}

dev/integration_tests/ui/test_driver/keyboard_resize_test.dart

@@ -1,3 +1,7 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
 import 'dart:async';
 
 import 'package:integration_ui/keys.dart' as keys;