Improve downgrade-upgrade integration test#53775
Merged
christopherfujino merged 2 commits intoflutter:masterfrom Apr 2, 2020
Merged
Improve downgrade-upgrade integration test#53775christopherfujino merged 2 commits intoflutter:masterfrom
christopherfujino merged 2 commits intoflutter:masterfrom
Conversation
fluttergithubbot
added
tool
christopherfujino
changed the title
| ], workingDirectory: parentDirectory.path, trace: true); | ||
| expect(exitCode, 0); | ||
|
|
||
| // Step 2. Switch to the dev branch. |
Contributor
Author
There was a problem hiding this comment.
These comments refer to dev branch anyway :)
christopherfujino
added
waiting for tree to go green
and removed
work in progress; do not review
labels
This was referenced Apr 3, 2020
pcsosinski
pushed a commit
to pcsosinski/flutter
that referenced
this pull request
Apr 6, 2020
pcsosinski
pushed a commit
that referenced
this pull request
Apr 6, 2020
* Support old and new git release tag formats (#53715) * Improve downgrade-upgrade integration test (#53775) * Fix diagnostics crash in profile mode (#53878) * Prevent diagnostics crash in profile mode * Prevent diagnostics crash in profile mode Co-authored-by: Christopher Fujino <[email protected]> Co-authored-by: Ferhat <[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
Before this PR, the
downgrade_upgrade_integration_test.dartwas failing during fast forward, however the test swallowed the tool exit. The fast forward would fail because the upgrade command'sresetChanges()method, intended to roll back from a hotfix commit back to the last published dev tag (e.g. fromv1.9.1+hotfix.6 -> v1.9.1), however, in this test it was actually jumping forward from the temp repo's hotfix tag (e.g.v1.9.1+hotfix.6) to the source repo's last dev tag (e.g.v1.6.4), and then trying to fast forward resulted in a merge conflict, causing thegit pull -ffto fail.This PR gets rid of the merge conflict by starting from the dev branch, so that the reset is to a tag that is on the current branch, making a fast forward valid. It also checks the exit code of each step, to protect against regression.
Related Issues
Part of #53688.
Tests
This improves an existing test.
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].