Merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1037904-run-tests into lp://qastaging/ubuntuone-control-panel
Proposed by
Mike McCracken
| Status: | Merged |
|---|---|
| Approved by: | Mike McCracken |
| Approved revision: | 345 |
| Merged at revision: | 345 |
| Proposed branch: | lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1037904-run-tests |
| Merge into: | lp://qastaging/ubuntuone-control-panel |
| Diff against target: |
45 lines (+4/-8) 1 file modified
run-tests (+4/-8) |
| To merge this branch: | bzr merge lp://qastaging/~mikemc/ubuntuone-control-panel/fix-1037904-run-tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Manuel de la Peña (community) | Approve | ||
| Roberto Alsina (community) | Approve | ||
| dobey (community) | Approve | ||
|
Review via email:
|
|||
Commit message
- Remove use of env vars for u1lint and u1trial from old buildout. (LP: #1037904)
Description of the change
- Remove use of env vars for u1lint and u1trial from old buildout. (LP: #1037904)
To post a comment you must log in.
Revision history for this message
| dobey (dobey) | # |
review:
Approve
Revision history for this message
| Roberto Alsina (ralsina) | # |
review:
Approve
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Revision history for this message
| Ubuntu One Auto Pilot (otto-pilot) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The attempt to merge lp:~mikemc/ubuntuone-control-panel/fix-1037904-run-tests into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.
*** Running DBus test suite ***
./run-tests: line 68: --reactor=glib: command not found