Merge lp://qastaging/~intrigeri/apparmor/increase-test-timeout into lp://qastaging/apparmor/2.12
Proposed by
intrigeri
| Status: | Merged |
|---|---|
| Approved by: | John Johansen |
| Approved revision: | 3717 |
| Merge reported by: | John Johansen |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~intrigeri/apparmor/increase-test-timeout |
| Merge into: | lp://qastaging/apparmor/2.12 |
| Diff against target: |
12 lines (+1/-1) 1 file modified
parser/tst/simple.pl (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~intrigeri/apparmor/increase-test-timeout |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| John Johansen | Approve | ||
|
Review via email:
|
|||
Commit message
Raises the self-test timeout to 4 minutes for really slow machines.
Description of the change
We've been applying this patch in Debian for 4 (!) years. This makes me sad, let's upstream it :)
To post a comment you must log in.
Revision history for this message
| John Johansen (jjohansen) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This is/was for slow platforms that could time out during the build due to load. It shouldn't slow down regular builds.