lp:~ack/landscape-client/multi-curl-test-fix
- Get this branch:
- bzr branch lp:~ack/landscape-client/multi-curl-test-fix
Branch merges
- Adam Collard (community): Approve
- Free Ekanayaka (community): Approve
-
Diff: 48 lines (+16/-9)1 file modifiedlandscape/lib/tests/test_fetch.py (+16/-9)
Branch information
Recent revisions
- 819. By Alberto Donato
-
Merge fix-vivid-
lxc-detection [f=1449920] [r=tealeg,fcorrea] [a=Alberto Donato]
This fixes container detection on Vivid hosts.
With the switch to systemd, the /run/container_type is no longer created (unless init-system-helpers is installed), so container detection fails.The same information is also available in /run/systemd/
container, so the branch also checks for that file. - 817. By Björn Tillenius
-
Merge systemerror-
no-retry [f=1444419] [r=chad.smith,ack] [a=Björn Tillenius]
Don't retry package operations if a SystemError is raised, since a
SystemError is most likely a permanent error and retrying won't help.The original patch to retry the operation was to handle lock errors,
which are still properly retried with this branch. - 815. By Chris Glass
-
Merge take-two-
1434546- exit-code- 2-on-error [f=1434546] [r=ack,benji] [a=Chris Glass]
Restore behavior of the program exiting with a non-zero exit code in case of
error during registration (specifically, "2"). - 814. By Chris Glass
-
Merge fix-1429888-
wrong-credentia ls-stacktrace [f=1429888] [r=bjornt, adam-collard] [a=Chris Glass]
This branch fixes the related bug, where inappropriate account/password combinations made client registration badly. - 813. By Benji York
-
Merge bug-1428826-restore-
register- function- public- API [f=1428826] [r=adam- collard, bjornt] [a=Benji York]
Instead of running client configuration as an independent executable
(which would have been preferable), the client charm reaches inside and
calls the register() function directly. That has resulted in a
dependency on register()'s API which was not enforced via testing or
documented in register()'s docstring.This branch restores the API the charm depends on, adds documentation as
to its meaning and importance, and adds tests that will warn us if the
API is broken in the future.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~landscape/landscape-client/trunk