Unverified Commit e72e7f9f authored by Jenn Magder's avatar Jenn Magder Committed by GitHub

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

parent 98a77e2a
...@@ -300,6 +300,7 @@ class IOSDevice extends Device { ...@@ -300,6 +300,7 @@ class IOSDevice extends Device {
Map<String, dynamic> platformArgs, Map<String, dynamic> platformArgs,
bool prebuiltApplication = false, bool prebuiltApplication = false,
bool ipv6 = false, bool ipv6 = false,
@visibleForTesting Duration fallbackPollingDelay,
}) async { }) async {
String packageId; String packageId;
...@@ -416,6 +417,7 @@ class IOSDevice extends Device { ...@@ -416,6 +417,7 @@ class IOSDevice extends Device {
portForwarder: portForwarder, portForwarder: portForwarder,
protocolDiscovery: observatoryDiscovery, protocolDiscovery: observatoryDiscovery,
flutterUsage: globals.flutterUsage, flutterUsage: globals.flutterUsage,
pollingDelay: fallbackPollingDelay,
); );
final Uri localUri = await fallbackDiscovery.discover( final Uri localUri = await fallbackDiscovery.discover(
assumedDevicePort: assumedObservatoryPort, assumedDevicePort: assumedObservatoryPort,
......
...@@ -46,14 +46,14 @@ class FallbackDiscovery { ...@@ -46,14 +46,14 @@ class FallbackDiscovery {
@required Usage flutterUsage, @required Usage flutterUsage,
VmServiceConnector vmServiceConnectUri = VmServiceConnector vmServiceConnectUri =
vm_service_io.vmServiceConnectUri, vm_service_io.vmServiceConnectUri,
Duration pollingDelay = const Duration(seconds: 2), Duration pollingDelay,
}) : _logger = logger, }) : _logger = logger,
_mDnsObservatoryDiscovery = mDnsObservatoryDiscovery, _mDnsObservatoryDiscovery = mDnsObservatoryDiscovery,
_portForwarder = portForwarder, _portForwarder = portForwarder,
_protocolDiscovery = protocolDiscovery, _protocolDiscovery = protocolDiscovery,
_flutterUsage = flutterUsage, _flutterUsage = flutterUsage,
_vmServiceConnectUri = vmServiceConnectUri, _vmServiceConnectUri = vmServiceConnectUri,
_pollingDelay = pollingDelay; _pollingDelay = pollingDelay ?? const Duration(seconds: 2);
static const String _kEventName = 'ios-handshake'; static const String _kEventName = 'ios-handshake';
......
...@@ -129,6 +129,7 @@ void main() { ...@@ -129,6 +129,7 @@ void main() {
prebuiltApplication: true, prebuiltApplication: true,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
platformArgs: <String, dynamic>{}, platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
); );
verify(globals.flutterUsage.sendEvent('ios-handshake', 'mdns-success')).called(1); verify(globals.flutterUsage.sendEvent('ios-handshake', 'mdns-success')).called(1);
...@@ -173,6 +174,7 @@ void main() { ...@@ -173,6 +174,7 @@ void main() {
prebuiltApplication: true, prebuiltApplication: true,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
platformArgs: <String, dynamic>{}, platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
); );
expect(launchResult.started, true); expect(launchResult.started, true);
...@@ -219,6 +221,7 @@ void main() { ...@@ -219,6 +221,7 @@ void main() {
prebuiltApplication: true, prebuiltApplication: true,
debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug), debuggingOptions: DebuggingOptions.enabled(BuildInfo.debug),
platformArgs: <String, dynamic>{}, platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
); );
expect(launchResult.started, false); expect(launchResult.started, false);
...@@ -257,6 +260,7 @@ void main() { ...@@ -257,6 +260,7 @@ void main() {
prebuiltApplication: true, prebuiltApplication: true,
debuggingOptions: DebuggingOptions.disabled(BuildInfo.release), debuggingOptions: DebuggingOptions.disabled(BuildInfo.release),
platformArgs: <String, dynamic>{}, platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
); );
expect(launchResult.started, true); expect(launchResult.started, true);
...@@ -347,6 +351,7 @@ void main() { ...@@ -347,6 +351,7 @@ void main() {
verboseSystemLogs: true, verboseSystemLogs: true,
), ),
platformArgs: <String, dynamic>{}, platformArgs: <String, dynamic>{},
fallbackPollingDelay: Duration.zero,
); );
expect(launchResult.started, true); expect(launchResult.started, true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment