DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't elapse real time during IOSDevice.startApp tests (#58538) (#58622)

Browse Source
This commit is contained in:
Jenn Magder 2020-06-03 12:43:02 -07:00 committed by GitHub
parent 98a77e2aff
commit e72e7f9fb0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/flutter_tools/lib/src/ios/devices.dart
View File

@ -300,6 +300,7 @@ class IOSDevice extends Device {
Map<String, dynamic> platformArgs,
bool prebuiltApplication = false,
bool ipv6 = false,
@visibleForTesting Duration fallbackPollingDelay,
}) async {
String packageId;
@ -416,6 +417,7 @@ class IOSDevice extends Device {
portForwarder: portForwarder,
protocolDiscovery: observatoryDiscovery,
flutterUsage: globals.flutterUsage,
pollingDelay: fallbackPollingDelay,
);
final Uri localUri = await fallbackDiscovery.discover(
assumedDevicePort: assumedObservatoryPort,

4
packages/flutter_tools/lib/src/ios/fallback_discovery.dart
View File

@ -46,14 +46,14 @@ class FallbackDiscovery {
@required Usage flutterUsage,
VmServiceConnector vmServiceConnectUri =
vm_service_io.vmServiceConnectUri,
Duration pollingDelay = const Duration(seconds: 2),
Duration pollingDelay,
}) : _logger = logger,
_mDnsObservatoryDiscovery = mDnsObservatoryDiscovery,
_portForwarder = portForwarder,
_protocolDiscovery = protocolDiscovery,
_flutterUsage = flutterUsage,
_vmServiceConnectUri = vmServiceConnectUri,
_pollingDelay = pollingDelay;
_pollingDelay = pollingDelay ?? const Duration(seconds: 2);
static const String _kEventName = 'ios-handshake';

5
packages/flutter_tools/test/general.shard/ios/ios_device_start_prebuilt_test.dart
View File

@ -129,6 +129,7 @@ void main() {
prebuiltApplication: true,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
);
verify(globals.flutterUsage.sendEvent('ios-handshake', 'mdns-success')).called(1);
@ -173,6 +174,7 @@ void main() {
prebuiltApplication: true,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
);
expect(launchResult.started, true);
@ -219,6 +221,7 @@ void main() {
prebuiltApplication: true,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
);
expect(launchResult.started, false);
@ -257,6 +260,7 @@ void main() {
prebuiltApplication: true,
debuggingOptions: DebuggingOptions.disabled(BuildInfo.release),
platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
);
expect(launchResult.started, true);
@ -347,6 +351,7 @@ void main() {
verboseSystemLogs: true,
),
platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
);
expect(launchResult.started, true);