diff options
| author | Ryan Harper <ryan.harper@canonical.com> | 2018-04-12 15:32:25 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2018-04-12 15:32:25 -0400 |
| commit | c6dff581a9c253170d5e3f12fb83d16a8dec8257 (patch) | |
| tree | e2f7cdcb6d32440d5d0700e7d0262612d498b2c8 /tests/unittests/test_distros | |
| parent | 0f7745619ab0a61d7dee5bde43e1e970ddf4a9b6 (diff) | |
| download | vyos-cloud-init-c6dff581a9c253170d5e3f12fb83d16a8dec8257.tar.gz vyos-cloud-init-c6dff581a9c253170d5e3f12fb83d16a8dec8257.zip | |
Implement ntp client spec with auto support for distro selection
Add a base NTP client configuration dictionary and allow Distro
specific changes to be merged. Add a select client function which
implements logic to preferr installed clients over clients which
need to be installed. Also allow distributions to override the
cloud-init defaults.
LP: #1749722
Diffstat (limited to 'tests/unittests/test_distros')
| -rw-r--r-- | tests/unittests/test_distros/test_netconfig.py | 6 | ||||
| -rw-r--r-- | tests/unittests/test_distros/test_user_data_normalize.py | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/unittests/test_distros/test_netconfig.py b/tests/unittests/test_distros/test_netconfig.py index 1c2e45fe..7765e408 100644 --- a/tests/unittests/test_distros/test_netconfig.py +++ b/tests/unittests/test_distros/test_netconfig.py @@ -189,6 +189,12 @@ hn0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 status: active """ + def setUp(self): + super(TestNetCfgDistro, self).setUp() + self.add_patch('cloudinit.util.system_is_snappy', 'm_snappy') + self.add_patch('cloudinit.util.system_info', 'm_sysinfo') + self.m_sysinfo.return_value = {'dist': ('Distro', '99.1', 'Codename')} + def _get_distro(self, dname, renderers=None): cls = distros.fetch(dname) cfg = settings.CFG_BUILTIN diff --git a/tests/unittests/test_distros/test_user_data_normalize.py b/tests/unittests/test_distros/test_user_data_normalize.py index 0fa9cdb5..fa4b6cfe 100644 --- a/tests/unittests/test_distros/test_user_data_normalize.py +++ b/tests/unittests/test_distros/test_user_data_normalize.py @@ -22,6 +22,12 @@ bcfg = { class TestUGNormalize(TestCase): + def setUp(self): + super(TestUGNormalize, self).setUp() + self.add_patch('cloudinit.util.system_is_snappy', 'm_snappy') + self.add_patch('cloudinit.util.system_info', 'm_sysinfo') + self.m_sysinfo.return_value = {'dist': ('Distro', '99.1', 'Codename')} + def _make_distro(self, dtype, def_user=None): cfg = dict(settings.CFG_BUILTIN) cfg['system_info']['distro'] = dtype |