Merge lp://staging/~simpoir/landscape-client/py3fix-network-usage into lp://staging/~landscape/landscape-client/trunk
Proposed by
Simon Poirier
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Simon Poirier | ||||
| Approved revision: | 1018 | ||||
| Merged at revision: | 1020 | ||||
| Proposed branch: | lp://staging/~simpoir/landscape-client/py3fix-network-usage | ||||
| Merge into: | lp://staging/~landscape/landscape-client/trunk | ||||
| Diff against target: |
197 lines (+51/-22) 6 files modified
landscape/broker/store.py (+2/-1) landscape/lib/amp.py (+2/-1) landscape/lib/bpickle.py (+22/-16) landscape/lib/tests/test_amp.py (+15/-0) landscape/lib/tests/test_bpickle.py (+8/-2) landscape/monitor/tests/test_networkactivity.py (+2/-2) |
||||
| To merge this branch: | bzr merge lp://staging/~simpoir/landscape-client/py3fix-network-usage | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| 🤖 Landscape Builder | test results | Approve | |
| Eric Snow (community) | Approve | ||
|
Review via email:
|
|||
Commit message
This branch fixes reporting of network usage under python3. It adds a parameter to bpicle to allow loading without casting bytes keys to string in dict in the cases where data need to be passed as-is (broker and messaging serialization).
Description of the change
This branch fixes reporting of network usage under python3. It adds a parameter to bpicle to allow loading without casting bytes keys to string in dict in the cases where data need to be passed as-is (broker and messaging serialization).
Testing instructions:
make check2 check3
./scripts/
Accept the client and check in Monitoring for network graphs a few minutes later.
To post a comment you must log in.
Revision history for this message
| 🤖 Landscape Builder (landscape-builder) | # |
review:
Abstain
(executing tests)
Revision history for this message
| 🤖 Landscape Builder (landscape-builder) wrote | # |
review:
Needs Fixing
(test results)
Revision history for this message
| 🤖 Landscape Builder (landscape-builder) | # |
review:
Abstain
(executing tests)
Revision history for this message
| 🤖 Landscape Builder (landscape-builder) wrote | # |
review:
Approve
(test results)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Command: TRIAL_ARGS=-j4 make ci-check
Result: Fail
Revno: 1018
Branch: lp:~simpoir/landscape-client/py3fix-network-usage
Jenkins: https:/