Merge lp:~gocept/landscape-client/py3-broker-registration into lp:~landscape/landscape-client/trunk
Status: | Merged |
---|---|
Approved by: | Eric Snow |
Approved revision: | 976 |
Merged at revision: | 978 |
Proposed branch: | lp:~gocept/landscape-client/py3-broker-registration |
Merge into: | lp:~landscape/landscape-client/trunk |
Prerequisite: | lp:~gocept/landscape-client/py3-broker-exchange |
Diff against target: |
306 lines (+54/-42) 6 files modified
landscape/broker/registration.py (+1/-1) landscape/broker/tests/test_registration.py (+19/-8) landscape/lib/tests/test_vm_info.py (+14/-14) landscape/lib/vm_info.py (+18/-17) landscape/message_schemas.py (+1/-1) py3_ready_tests (+1/-1) |
To merge this branch: | bzr merge lp:~gocept/landscape-client/py3-broker-registration |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Snow (community) | Approve | ||
Daniel Havlik (community) | Approve | ||
Данило Шеган (community) | Approve | ||
🤖 Landscape Builder | test results | Approve | |
Review via email: mp+320799@code.launchpad.net |
Commit message
This is the port of landscape.
This involved fixing bytes/unicode issues. One situation in the tests involved incompatibilities involving io.StringIO. The fix there is not ideal. Applying a better solution is tabled for later.
Description of the change
As the diff for the landscape.broker module would be to large, I MP the sub-modules separately.
Here we have landscape.
The case with the conditional encoding to compare bytes of log messages in unfortunate. I tried a few different approaches but a drop-in replacement of cStringIO with io.StringIO would result in a lot of test failures so I would rather suggest to put that on a trello card and look at this problem separately.
Command: TRIAL_ARGS=-j4 make check /ci.lscape. net/job/ latch-test- xenial/ 3715/
Result: Success
Revno: 976
Branch: lp:~gocept/landscape-client/py3-broker-registration
Jenkins: https:/