github/flutter
7
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2025-06-03 00:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make initial daemon devices population fast (#56959)

Browse Source
This commit is contained in:
Jenn Magder 2020-05-14 11:00:51 -07:00 committed by GitHub
parent f66d3c5ab2
commit bd430081e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/flutter_tools/lib/src/device.dart
View File

@ -297,19 +297,21 @@ abstract class PollingDeviceDiscovery extends DeviceDiscovery {
void startPolling() {
if (_timer == null) {
_items ??= ItemListNotifier<Device>();
_timer = _initTimer();
// Make initial population the default, fast polling timeout.
_timer = _initTimer(null);
}
}
Timer _initTimer() {
Timer _initTimer(Duration pollingTimeout) {
return Timer(_pollingInterval, () async {
try {
final List<Device> devices = await pollingGetDevices(timeout: _pollingTimeout);
final List<Device> devices = await pollingGetDevices(timeout: pollingTimeout);
_items.updateWithNewList(devices);
} on TimeoutException {
globals.printTrace('Device poll timed out. Will retry.');
}
_timer = _initTimer();
// Subsequent timeouts after initial population should wait longer.
_timer = _initTimer(_pollingTimeout);
});
}

4
packages/flutter_tools/test/commands.shard/hermetic/daemon_test.dart
View File

@ -194,7 +194,7 @@ void main() {
responses.add,
notifyingLogger: notifyingLogger,
);
final MockPollingDeviceDiscovery discoverer = MockPollingDeviceDiscovery();
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
daemon.deviceDomain.addDeviceDiscoverer(discoverer);
discoverer.addDevice(MockAndroidDevice());
commands.add(<String, dynamic>{'id': 0, 'method': 'device.getDevices'});
@ -216,7 +216,7 @@ void main() {
notifyingLogger: notifyingLogger,
);
final MockPollingDeviceDiscovery discoverer = MockPollingDeviceDiscovery();
final FakePollingDeviceDiscovery discoverer = FakePollingDeviceDiscovery();
daemon.deviceDomain.addDeviceDiscoverer(discoverer);
discoverer.addDevice(MockAndroidDevice());

25
packages/flutter_tools/test/general.shard/device_test.dart
View File

@ -9,6 +9,7 @@ import 'package:flutter_tools/src/device.dart';
import 'package:flutter_tools/src/base/io.dart';
import 'package:flutter_tools/src/project.dart';
import 'package:mockito/mockito.dart';
import 'package:quiver/testing/async.dart';
import '../src/common.dart';
import '../src/context.dart';
@ -63,6 +64,26 @@ void main() {
});
});
group('PollingDeviceDiscovery', () {
testUsingContext('startPolling', () async {
FakeAsync().run((FakeAsync time) {
final FakePollingDeviceDiscovery pollingDeviceDiscovery = FakePollingDeviceDiscovery();
pollingDeviceDiscovery.startPolling();
time.elapse(const Duration(milliseconds: 4001));
time.flushMicrotasks();
// First check should use the default polling timeout
// to quickly populate the list.
expect(pollingDeviceDiscovery.lastPollingTimeout, isNull);
time.elapse(const Duration(milliseconds: 4001));
time.flushMicrotasks();
// Subsequent polling should be much longer.
expect(pollingDeviceDiscovery.lastPollingTimeout, const Duration(seconds: 30));
pollingDeviceDiscovery.stopPolling();
});
});
});
group('Filter devices', () {
FakeDevice ephemeral;
FakeDevice nonEphemeralOne;
@ -198,12 +219,12 @@ void main() {
class TestDeviceManager extends DeviceManager {
TestDeviceManager(List<Device> allDevices) {
_deviceDiscoverer = MockPollingDeviceDiscovery();
_deviceDiscoverer = FakePollingDeviceDiscovery();
resetDevices(allDevices);
}
@override
List<DeviceDiscovery> get deviceDiscoverers => <DeviceDiscovery>[_deviceDiscoverer];
MockPollingDeviceDiscovery _deviceDiscoverer;
FakePollingDeviceDiscovery _deviceDiscoverer;
void resetDevices(List<Device> allDevices) {
_deviceDiscoverer.setDevices(allDevices);

4
packages/flutter_tools/test/src/mocks.dart
View File

@ -482,8 +482,8 @@ class MockStdio extends Stdio {
List<String> get writtenToStderr => _stderr.writes.map<String>(_stderr.encoding.decode).toList();
}
class MockPollingDeviceDiscovery extends PollingDeviceDiscovery {
MockPollingDeviceDiscovery() : super('mock');
class FakePollingDeviceDiscovery extends PollingDeviceDiscovery {
FakePollingDeviceDiscovery() : super('mock');
final List<Device> _devices = <Device>[];
final StreamController<Device> _onAddedController = StreamController<Device>.broadcast();