Merge lp://qastaging/~allenap/maas/rabbit-resource into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Gavin Panella
| Status: | Merged |
|---|---|
| Merged at revision: | 38 |
| Proposed branch: | lp://qastaging/~allenap/maas/rabbit-resource |
| Merge into: | lp://qastaging/~maas-committers/maas/trunk |
| Diff against target: |
324 lines (+169/-14) 11 files modified
buildout.cfg (+7/-4) setup.py (+11/-3) src/maas/development.py (+2/-1) src/maasserver/tests/__init__.py (+2/-2) src/maasserver/tests/test_api.py (+1/-1) src/maasserver/tests/test_macaddressfield.py (+1/-1) src/maasserver/tests/test_models.py (+1/-1) src/maastesting/rabbit.py (+65/-0) src/maastesting/tests/__init__.py (+18/-0) src/maastesting/tests/test_rabbit.py (+60/-0) templates/test.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~allenap/maas/rabbit-resource |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Raphaël Badin (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Provide a RabbitMQ server as a test resource.
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
Looks good!
The only thing that I don't like about this is that it has slowed down the execution of the test suite (10s on my machine [this branch] vs. 0.4s [trunk]) but I guess there is not much we can do about it :(
[0]
8 - ${buildout:
9 - ${buildout:
10 - ${buildout:
11 + ${buildout:
You just stole my next drive-by fix! :)
[1]
152 === renamed directory 'src/maas/testing' => 'src/maastesting'
I like that! Much better to have an app (maasserver) depend on another app rather that on some resource located in a project!