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

[flutter_tools] If run fails to install the application on iOS, try uninstalling it and trying again. (#68078)

Browse Source
This commit is contained in:
Jonah Williams 2020-10-14 09:14:36 -07:00 committed by GitHub
parent 8a7fd39b85
commit 61ba7dd218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -268,6 +268,33 @@ class IOSDevice extends Device {
_logger.printError(e.message);
return false;
}
if (installationResult == 0) {
return true;
}
_logger.printTrace('application failed to install: $installationResult');
// If the initial installation fails, attempt to uninstall the app if
// it was already installed. Regardless of whether or not this is successful,
// try once more to install.
if (await isAppInstalled(app, userIdentifier: userIdentifier)) {
_logger.printTrace('Uninstalling previously installed application...');
if (!await uninstallApp(app, userIdentifier: userIdentifier)) {
_logger.printTrace('Failed to uninstall');
}
}
try {
installationResult = await _iosDeploy.installApp(
deviceId: id,
bundlePath: bundle.path,
launchArguments: <String>[],
interfaceType: interfaceType,
);
} on ProcessException catch (e) {
_logger.printError(e.message);
return false;
}
if (installationResult != 0) {
_logger.printError('Could not install ${bundle.path} on $id.');
_logger.printError('Try launching Xcode and selecting "Product > Run" to fix the problem:');

55
packages/flutter_tools/test/general.shard/ios/ios_device_install_test.dart
View File

@ -252,6 +252,61 @@ void main() {
expect(wasAppInstalled, false);
});
testWithoutContext('IOSDevice.installApp retries installation if it fails once', () async {
final FileSystem fileSystem = MemoryFileSystem.test();
final IOSApp iosApp = PrebuiltIOSApp(
projectBundleId: 'app',
bundleDir: fileSystem.currentDirectory,
);
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[
FakeCommand(command: <String>[
iosDeployPath,
'--id',
'1234',
'--bundle',
'/',
'--no-wifi',
], environment: const <String, String>{
'PATH': '/usr/bin:null',
...kDyLdLibEntry,
}, exitCode: 1),
FakeCommand(command: <String>[
iosDeployPath,
'--id',
'1234',
'--exists',
'--timeout',
'10',
'--bundle_id',
'app',
]),
FakeCommand(command: <String>[
iosDeployPath,
'--id',
'1234',
'--uninstall_only',
'--bundle_id',
'app',
]),
FakeCommand(command: <String>[
iosDeployPath,
'--id',
'1234',
'--bundle',
'/',
'--no-wifi',
], environment: const <String, String>{
'PATH': '/usr/bin:null',
...kDyLdLibEntry,
}),
]);
final IOSDevice device = setUpIOSDevice(processManager: processManager, artifacts: artifacts);
final bool wasAppInstalled = await device.installApp(iosApp);
expect(wasAppInstalled, true);
expect(processManager.hasRemainingExpectations, false);
});
testWithoutContext('IOSDevice.uninstallApp catches ProcessException from ios-deploy', () async {
final IOSApp iosApp = PrebuiltIOSApp(projectBundleId: 'app');
final FakeProcessManager processManager = FakeProcessManager.list(<FakeCommand>[