[flutter_tools] catch ProcessException and throw ToolExit during upgrade#55759
Merged
fluttergithubbot merged 2 commits intoflutter:masterfrom Apr 27, 2020
Merged
Conversation
fluttergithubbot
added
the
tool
| ); | ||
| if (result.exitCode != 0) { | ||
| throwToolExit(null, exitCode: result.exitCode); | ||
| Future<void> attemptReset(String newRevision) async { |
Contributor
Author
There was a problem hiding this comment.
this first arg wasn't used
|
|
||
| @override | ||
| Future<bool> attemptReset(FlutterVersion flutterVersion, String newRevision) async => alreadyUpToDate; | ||
| Future<void> attemptReset(String newRevision) async {} |
Contributor
Author
There was a problem hiding this comment.
the return value was a mistake that should have been cleaned up in my previous PR.
13 tasks
…est.dart Co-Authored-By: Jonah Williams <[email protected]>
zanderso
approved these changes
Apr 27, 2020
pcsosinski
pushed a commit
to pcsosinski/flutter
that referenced
this pull request
Apr 28, 2020
pcsosinski
pushed a commit
that referenced
this pull request
Apr 28, 2020
* [flutter_tools] fix type error in symbolize (#55212) * [flutter_tools] check first for stable tag, then dev tag (#55342) * [flutter_tools] enable `flutter upgrade` to support force pushed branches (#55594) * [flutter_tools] catch ProcessException and throw ToolExit during upgrade (#55759) * Update engine version to 376ad6a64b08aa26005e3f82aed26de2e290b572 Co-authored-by: Jonah Williams <[email protected]> Co-authored-by: Christopher Fujino <[email protected]> Co-authored-by: Christopher Fujino <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Previously the
attemptResetmethod (of theflutter upgradeflow) was invoking git withthrowOnErrorwhile also checking if the exit code was non-zero. Thus we were never actually catching the errors. This wraps the process call in a try, catchingProcessExceptions and throwing tool exits on them.Related Issues
Based on this comment, related to #55576
Tests
Added a new unit test to verify this behavior.
Checklist
Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes (
[x]). This will ensure a smooth and quick review process.///).flutter analyze --flutter-repo) does not report any problems on my PR.Breaking Change
Did any tests fail when you ran them? Please read [Handling breaking changes].