Merge lp://qastaging/~brian.curtin/ubuntuone-control-panel/jenkins-fix into lp://qastaging/ubuntuone-control-panel
Proposed by
Brian Curtin
| Status: | Merged |
|---|---|
| Approved by: | Manuel de la Peña |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 327 |
| Proposed branch: | lp://qastaging/~brian.curtin/ubuntuone-control-panel/jenkins-fix |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
27 lines (+3/-0) 1 file modified
ubuntuone/controlpanel/utils/tests/test_windows.py (+3/-0) |
| To merge this branch: | bzr merge lp://qastaging/~brian.curtin/ubuntuone-control-panel/jenkins-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Manuel de la Peña (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Add skipIfJenkins decorator to two tests which only fail on the Jenkins setup
Description of the change
Use the new Jenkins skip decorator to skip two tests that fail due to permissions on the Windows jenkins machine.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Great! lets get those tests out for jenkins.