Merge lp:~gfidente/cloud-init/try_fqdn_from_hosts into lp:~cloud-init-dev/cloud-init/trunk
Status: | Rejected |
---|---|
Rejected by: | Scott Moser |
Proposed branch: | lp:~gfidente/cloud-init/try_fqdn_from_hosts |
Merge into: | lp:~cloud-init-dev/cloud-init/trunk |
Diff against target: |
139 lines (+96/-5) 2 files modified
cloudinit/util.py (+9/-5) tests/unittests/test_util.py (+87/-0) |
To merge this branch: | bzr merge lp:~gfidente/cloud-init/try_fqdn_from_hosts |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
cloud-init Commiters | Pending | ||
Review via email: mp+294680@code.launchpad.net |
Description of the change
In util.py , get_hostname_fqdn tries cloud.get_
This change is meant to make it try get_fqdn_from_hosts if fqdn does not contain any dot.
Unmerged revisions
- 1222. By Giulio Fidente
-
Ensure temporary 'hosts' file used for testing is deleted via addCleanup
While tearDown is not executed in case of errors raised during the setUp
phase while addCleanup is; this change updates test_util.py so that the
temporary 'hosts' file created to run some unit tests is deleted in
addCleanup instead of tearDown. - 1221. By Giulio Fidente
-
Fix test_from_cloud()
The FakeCloudWithDomain provider was incorrectly returning the fqdn
when called with fqdn=False - 1220. By Giulio Fidente
-
Adds unit tests for util.py
This adds seven new unit tests are meant to cover get_hostname_fqdn() and
get_fqdn_from_hosts( ) from util.py - 1219. By Giulio Fidente
-
Ensure fqdn is not left to None if get_fqdn_from_hosts returns None
- 1218. By Giulio Fidente
-
Try get_fqdn_from_hosts if get_hostname(
fqdn=True) is unable to find one
Anyway to add some unittests for this?