Confirmed users
425
edits
TestEngineering/Web/Automation/Gaia UI Testing: Difference between revisions
Jump to navigation
Jump to search
TestEngineering/Web/Automation/Gaia UI Testing (view source)
Revision as of 22:34, 25 November 2013
, 25 November 2013no edit summary
No edit summary |
|||
| Line 80: | Line 80: | ||
# Merge the pull request: | # Merge the pull request: | ||
## If you are the second reviewer to ''r+'' the pull request then you may merge it. See merging pull requests for details. | ## If you are the second reviewer to ''r+'' the pull request then you may merge it. See merging pull requests for details. | ||
== Merging Pull Requests == | |||
Before merging a pull request, please ensure that: | |||
# The attachment to the bug has at least two positive (''r+'') reviews. | |||
# The Travis build of the pull request has passed. | |||
## If the Travis build failed check it to see if the ''gaia_ui_tests'' step failed, and if it did whether any of the affected tests failed. Although it is preferred that no pull request be merged with a failing Travis build, if you are confident that the Travis failure had nothing to do with the changes in the pull request you may merge it, at your own discretion. | |||
## You may also request a rerun of the Travis build, which you do via the [https://travis-ci.org/mozilla-b2g/gaia/pull_requests Travis UI], if you would prefer to see it pass before merging. | |||
When it is time to merge, do the following: | |||
# Visit the pull request and click the big green ''Merge pull request'' button. | |||
# Go to the bug and ensure that all reviews are cleared. | |||
# Add a comment to the bug with a link to the merge commit, indicating on which branch the patch landed. | |||
# If this was a merge to master, consider whether the patch should be uplifted. Follow the procedure in [blah]. | |||
# If the bug is finished (e.g., no uplifts are needed), mark it as Resolved - Fixed. | |||
= Keeping Branches in Sync with Master = | = Keeping Branches in Sync with Master = | ||