Merge lp://staging/~larry-e-works/uci-engine/amqp-to-kombu into lp://staging/uci-engine
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~larry-e-works/uci-engine/amqp-to-kombu |
| Merge into: | lp://staging/uci-engine |
| Diff against target: |
120 lines (+32/-17) 2 files modified
ci-utils/ci_utils/amqp_utils.py (+30/-16) testing/venv.py (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~larry-e-works/uci-engine/amqp-to-kombu |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Canonical CI Engineering | Pending | ||
|
Review via email:
|
|||
Commit message
Changed the bits in ci-utils/
Description of the change
Merged from trunk to gather in all of the changes since work started on this; no conflicts.
Changed the bits in ci-utils/
| Larry E Works (larry-e-works) wrote | # |
Unmerged revisions
- 772. By Larry E Works
-
Modified send() in amqp_utils.pu to call kombu in the correct manner. This worked with the test in the sense that I can ssh into the rabbit server and see the test queue get created and populated. The rest of the test still fails since the test itself (tests.
test_rabbit. TestRabbit. test_acked_ message) is still written to use libamqp functionality that doesn not directly translate to kombu functionality. Modified venv.py to add the needed kombu dependencies for testing. The deps have been downloaded locally, added and pushed to lp:~canonical-ci-engineering/uci-engine/deps/
- 771. By Larry E Works
-
Merged from trunk while I was at it; no conflicts.
- 770. By Larry E Works
-
Seems I missed a comma at the end of the password=
rabbit_ config. AMQP_PASSWORD line. Have added and will re-run. - 769. By Larry E Works
-
Massive merge from trunk, no conflicts.
- 768. By Larry E Works
-
Initial try at replacing amqp with kombu.
Was thinking about this earlier (and the traceback received when attempting to run the tests) and the problem originates with with a missing comma in setting the kombu connection string. Have fixed that and will try again.