Merge lp://staging/~facundo/magicicada-protocol/xenial-tests into lp://staging/magicicada-protocol
Proposed by
Facundo Batista
| Status: | Merged |
|---|---|
| Approved by: | Natalia Bidart |
| Approved revision: | 168 |
| Merged at revision: | 167 |
| Proposed branch: | lp://staging/~facundo/magicicada-protocol/xenial-tests |
| Merge into: | lp://staging/magicicada-protocol |
| Diff against target: |
480 lines (+124/-83) 12 files modified
run-tests (+2/-2) samples/easy_client.py (+3/-2) samples/ping_client.py (+3/-3) setup.py (+0/-2) tests/certs/cert1.pem (+29/-0) tests/certs/cert2.pem (+25/-0) tests/test_client.py (+47/-38) tests/test_context.py (+3/-27) tests/test_proxy_tunnel.py (+1/-1) ubuntuone/storageprotocol/client.py (+5/-5) ubuntuone/storageprotocol/content_hash.py (+5/-1) ubuntuone/storageprotocol/request.py (+1/-2) |
| To merge this branch: | bzr merge lp://staging/~facundo/magicicada-protocol/xenial-tests |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Natalia Bidart | Approve | ||
|
Review via email:
|
|||
Commit message
Small changes for tests to run ok under xenial.
Description of the change
Small changes for tests to run ok under xenial.
Including:
- removed two tests that checked situations after having a protobuf message with an invalid value, and this is not possible anymore in modern protobuf (can not create the request itself, because of internal verifications at creation time).
- Stop patching the certificates loader, just set the proper env var in the test and use regular code. Also included the certificates in the project (previously they were being taken from SSO).
- Lot of aesthetic small details
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! Thanks