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:20, 25 November 2013
, 25 November 2013→Completing Requested Reviews
| Line 54: | Line 54: | ||
= Completing Requested Reviews = | = Completing Requested Reviews = | ||
Your second priority, when supporting Gaia UI Testing, is to complete any reviews that have been requested of you. Bugzilla is your friend | Your second priority, when supporting Gaia UI Testing, is to complete any reviews that have been requested of you. Reviews generally mean reviewing a pull request and Bugzilla is your friend in finding these. You can see all of your requested reviews on your [https://bugzilla.mozilla.org/page.cgi?id=mydashboard.html Buzilla Dashboard] in the section labelled ''Flags Requested of You''. | ||
Each bug that has you listed as a reviewer with a ''?'' flag will appear on this list. Here is a recommended workflow for each pull request you review. Note that this uses the ''master'' branch as an example. | |||
# Make sure you are on the correct branch and that it is up to date: | |||
## <code>git checkout master && git pull upstream master</code> | |||
# Create a new branch for the review: | |||
## <code> git checkout -b branch_name</code> | |||
# Pull the changes for the pull request from the requester's branch: | |||
## <code> git pull url_of_requesters_repo branch_name</code> | |||
### Note that you may find it useful to add remotes for any repos for which you are frequently asked to perform reviews. You can do this using <code>git remote add remote_name repo_url</code>, and you can then use <code> git pull remote_name branch_name</code> instead of the above. | |||
### You should not experience any merge conflicts when doing this pull. If you do, check the pull request. If it indicates that it cannot be merged then add a comment to the pull request that conflicts need to be resolved and flag the attachment on the bug as ''-'' to indicate it did not pass your review. | |||
#### If the pull request is not marked as being unable to be merged then something went wrong with your pull. Perhaps your local branch was not up to date. Start the process again at #1 above. | |||
# Run the affected test(s) against the branch in question to ensure that they all pass. | |||
## Note that there may be several tests affected which may not be included in the pull request. For example, if a locator or method in an app object changes, then any tests that make use of that app object property or method would need to be tested. | |||
## If the tests do not pass: | |||
### Check to see if any are xfailed and note these. They are not expected to pass, so they should not affect your review. | |||
### For any that are not xfailed, add a comment to the pull request to indicate which tests failed. Be sure to include the full stack trace of the failure(s) in your comments. Then flag the attachment on the bug as ''-'' to indicate it did not pass your review. | |||
## Assuming that the tests are passing, continue to the next step. | |||
# Review the code in the pull request: | |||
## Check against the expected style of the gaia-ui-tests. | |||
## Check for pep8 errors. | |||
## The commit message should be pre-populated with the commit message from when the changes were committed to master. Leave this commit message intact. You may add a second line to the message to indicate that this is an uplift to the branch of interest. | |||
# Push your changes to your Github repo: | |||
## <code>git push origin branch_name</code> | |||
# When the pull request for the uplift has been merged, set the ''status-b2g-v1.2'' flag to ''fixed'' and close the bug. | |||
# Go to Github and issue a pull request against your branch. | |||
## Make sure the pull request is being issued against the correct upstream branch (e.g., v1.2). This will likely not be the default so you will have to change it manually. | |||
# Attach the pull request to the bug. | |||
## This can be done from the pull request if you have the [https://github.com/autonome/Github-Bugzilla-Tweaks Github Bugzilla Tweaks add-on] installed. | |||
## This can also be done by pasting the url to the Github pull request into an attachment to the bug using 'paste text as attachment'. | |||
## Flag the attachment for review and add a comment that this patch is to uplift to the branch of interest. | |||
= Keeping Branches in Sync with Master = | = Keeping Branches in Sync with Master = | ||