Merge lp://staging/~kwmonroe/charms/trusty/apache2/timeouts into lp://staging/charms/trusty/apache2

Proposed by Kevin W Monroe
Status: Merged
Merged at revision: 72
Proposed branch: lp://staging/~kwmonroe/charms/trusty/apache2/timeouts
Merge into: lp://staging/charms/trusty/apache2
Diff against target: 38 lines (+6/-4)
2 files modified
tests/10-bundles-test.py (+2/-2)
tests/20-mpm-test.py (+4/-2)
To merge this branch: bzr merge lp://staging/~kwmonroe/charms/trusty/apache2/timeouts
Reviewer Review Type Date Requested Status
Konstantinos Tsakalozos (community) Approve
charmers Pending
Review via email: mp+287222@code.staging.launchpad.net

Description of the change

Adjust timeouts for apache2 tests. 20-mpm-test.py was timing out for me on AWS because 180s wasn't long enough to get a unit up.

To post a comment you must log in.
Revision history for this message
Konstantinos Tsakalozos (kos.tsakalozos) wrote :

Thank you for fixing this. Tested the respective tests and found no issues.

review: Approve
Revision history for this message
Cory Johns (johnsca) wrote :

This has been merged and will be available in cs:trusty/apache2 shortly

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: