diff options
author | Chad Smith <chad.smith@canonical.com> | 2018-05-09 09:36:56 -0600 |
---|---|---|
committer | Chad Smith <chad.smith@canonical.com> | 2018-05-09 09:36:56 -0600 |
commit | 323eb30940cae2069daf74517089220fccc4afb9 (patch) | |
tree | d1ffd321afe20278c7bc4422a9715e55f5c20e0a /tests/cloud_tests/testcases/modules/ntp.py | |
parent | 4c1af5c7eb8db67f51f35130e13157a735256d2b (diff) | |
download | vyos-cloud-init-323eb30940cae2069daf74517089220fccc4afb9.tar.gz vyos-cloud-init-323eb30940cae2069daf74517089220fccc4afb9.zip |
tests: fix package and ca_cert cloud_tests on bionic
package_update_upgrade_install was failing as htop is now included in
Bionic images. Switch this test to install 'sl' instead.
ca_certs integration test fails on cert_count test because bionic
update-ca-certificates on bionic generates less symlinks for a given cert.
Integration tests now collect dpkg-query --show output on every instance.
Add a new assertPackageInstalled helper method which finds the package or
package version installed on the instance.
Adapt existing byobu, package_update_upgrade_install, ntp and salt_minion
tests to use assertPackageInstalled method.
LP: #1769985
Diffstat (limited to 'tests/cloud_tests/testcases/modules/ntp.py')
-rw-r--r-- | tests/cloud_tests/testcases/modules/ntp.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/cloud_tests/testcases/modules/ntp.py b/tests/cloud_tests/testcases/modules/ntp.py index b50e52fe..c63cc15e 100644 --- a/tests/cloud_tests/testcases/modules/ntp.py +++ b/tests/cloud_tests/testcases/modules/ntp.py @@ -9,15 +9,14 @@ class TestNtp(base.CloudTestCase): def test_ntp_installed(self): """Test ntp installed""" - out = self.get_data_file('ntp_installed') - self.assertEqual(0, int(out)) + self.assertPackageInstalled('ntp') def test_ntp_dist_entries(self): """Test dist config file is empty""" out = self.get_data_file('ntp_conf_dist_empty') self.assertEqual(0, int(out)) - def test_ntp_entires(self): + def test_ntp_entries(self): """Test config entries""" out = self.get_data_file('ntp_conf_pool_list') self.assertIn('pool.ntp.org iburst', out) |