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 16:32, 5 December 2013
, 5 December 2013no edit summary
No edit summary |
No edit summary |
||
| Line 99: | Line 99: | ||
# Go to the bug and ensure that all reviews are cleared. | # 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. | # 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 [ | # If this was a merge to master, consider whether the patch should be uplifted. Follow the procedure in [QA/Execution/Web_Testing/Automation/Gaia_UI_Testing#After_Changes_Have_Been_Committed_To_Master After Changes Have Been Committed To Master]. | ||
# If the bug is finished (e.g., no uplifts are needed), mark it as Resolved - Fixed. | # If the bug is finished (e.g., no uplifts are needed), mark it as Resolved - Fixed. | ||
| Line 156: | Line 156: | ||
## If the commit should be uplifted (or you are unsure, as above), either: | ## If the commit should be uplifted (or you are unsure, as above), either: | ||
### Flag it for uplifting by setting the ''status-b2g-v1.2'' flag to ''affected'', or | ### Flag it for uplifting by setting the ''status-b2g-v1.2'' flag to ''affected'', or | ||
### Complete the uplift yourself. This is preferable to flagging it for someone else to complete. See the section below about [ | ### Complete the uplift yourself. This is preferable to flagging it for someone else to complete. See the section below about [QA/Execution/Web_Testing/Automation/Gaia_UI_Testing#Uplifting_Commits Uplifting Commits]. | ||
### In either case, the bug should not be closed. | ### In either case, the bug should not be closed. | ||
## If you determine that the commit does not need to be uplifted, flag it as such by setting the ''status-b2g-v1.2'' flag to ''unaffected''. The bug can be closed. | ## If you determine that the commit does not need to be uplifted, flag it as such by setting the ''status-b2g-v1.2'' flag to ''unaffected''. The bug can be closed. | ||
| Line 193: | Line 193: | ||
Often a pull request which is an uplift from master to a branch of interest will contain code that is identical to that which was committed to master. That code has already been reviewed for correctness and style, so it may not be necessary to review the code itself as carefully. You will need to determine whether that is the case yourself. You could do that by comparing the files changed, after applying the commit in the pull request, with the same files in the master branch. | Often a pull request which is an uplift from master to a branch of interest will contain code that is identical to that which was committed to master. That code has already been reviewed for correctness and style, so it may not be necessary to review the code itself as carefully. You will need to determine whether that is the case yourself. You could do that by comparing the files changed, after applying the commit in the pull request, with the same files in the master branch. | ||
Regardless of the decision made above, follow the procedure in [ | Regardless of the decision made above, follow the procedure in [QA/Execution/Web_Testing/Automation/Gaia_UI_Testing#Merging_Pull_Requests Merging Pull Requests] | ||
== Finding Bugs That Require Uplifts == | == Finding Bugs That Require Uplifts == | ||
| Line 204: | Line 204: | ||
# As mentioned above, if you can complete an uplift yourself, by creating a pull request, rather than simply flagging a bug as affected, that is preferable. | # As mentioned above, if you can complete an uplift yourself, by creating a pull request, rather than simply flagging a bug as affected, that is preferable. | ||
# Monitor bugs that are flagged as ''status-b2g-v1.2: affected'' as described in [ | # Monitor bugs that are flagged as ''status-b2g-v1.2: affected'' as described in [QA/Execution/Web_Testing/Automation/Gaia_UI_Testing#Finding_Bugs_That_Require_Uplifts Finding Bugs That Require Uplifts]. | ||
# Complete a manual audit of commits that have landed in master but not v1.2. This is something that should be done once or twice per month. | # Complete a manual audit of commits that have landed in master but not v1.2. This is something that should be done once or twice per month. | ||
## Generate a list of all the commits that have landed in master but not v1.2 using this command: <code>git show master ^v1.2 --no-merges -- tests/python/gaia-ui-tests</code>. | ## Generate a list of all the commits that have landed in master but not v1.2 using this command: <code>git show master ^v1.2 --no-merges -- tests/python/gaia-ui-tests</code>. | ||