cloud-init-dev team mailing list archive

[Chad Smith <chad.smith@xxxxxxxxxxxxx>]

Review: Approve

Wow good to know about format issues on cent6 as I've used it in other places. I'll be wary for next time. +1

Diff comments:

> diff --git a/tests/unittests/test_handler/test_handler_ntp.py b/tests/unittests/test_handler/test_handler_ntp.py
> index 21f2ab1..bc4277b 100644
> --- a/tests/unittests/test_handler/test_handler_ntp.py
> +++ b/tests/unittests/test_handler/test_handler_ntp.py
> @@ -107,10 +107,10 @@ class TestNtp(FilesystemMockingTestCase):
>          mycloud = self._get_cloud(distro)
>          ntp_conf = self.tmp_path('ntp.conf', self.new_root)  # Doesn't exist
>          # Create ntp.conf.tmpl which isn't read
> -        with open('{}.tmpl'.format(ntp_conf), 'wb') as stream:
> +        with open('{0}.tmpl'.format(ntp_conf), 'wb') as stream:

wow, good to know for next time, as I've used format in my other branches.

>              stream.write(b'NOT READ: ntp.conf.<distro>.tmpl is primary')
>          # Create ntp.conf.tmpl.<distro>
> -        with open('{}.{}.tmpl'.format(ntp_conf, distro), 'wb') as stream:
> +        with open('{0}.{1}.tmpl'.format(ntp_conf, distro), 'wb') as stream:
>              stream.write(NTP_TEMPLATE)
>          with mock.patch('cloudinit.config.cc_ntp.NTP_CONF', ntp_conf):
>              cc_ntp.write_ntp_config_template(cfg, mycloud)


-- 
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/324585
Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:bug/fix-py26-tests-assertNone into cloud-init:master.