Merge ~powersj/cloud-init:fix-integration-ntp into cloud-init:master

[Joshua Powers]

tests: Fix ntp integration test regression

LP: #1692686

[Ryan Harper (raharper)]

Thank you for finding/fixing my merge error.

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:5375d9da344e84f496c54b253b42454e0888d101
https://jenkins.ubuntu.com/server/job/cloud-init-ci/374/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/374
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/374
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/374
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/374
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/374

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/374/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

I am pretty sure that you should change the docstring for 'test_ntp_entires'. Ie, you're changing 'ntp_conf_pools' to 'ntp_conf_servers' inside a function with a doc string "Test config pools entries".

And while you're there, you might as well spell entries right in the function name.

review: Needs Fixing

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:9fa17d4bc1ef2564e30ab655bf6de462296aecad
https://jenkins.ubuntu.com/server/job/cloud-init-ci/375/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/375
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/375
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/375
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-s390x/375
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/375

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/375/rebuild

review: Approve (continuous-integration)

diff --git a/tests/cloud_tests/testcases/modules/ntp_servers.py b/tests/cloud_tests/testcases/modules/ntp_servers.py
index 9ef270e..4010cf8 100644
--- a/tests/cloud_tests/testcases/modules/ntp_servers.py
+++ b/tests/cloud_tests/testcases/modules/ntp_servers.py
@@ -17,9 +17,9 @@ class TestNtpServers(base.CloudTestCase):
         out = self.get_data_file('ntp_conf_dist_servers')
         self.assertEqual(0, int(out))
 
-    def test_ntp_entires(self):
-        """Test config pools entries"""
-        out = self.get_data_file('ntp_conf_pools')
+    def test_ntp_entries(self):
+        """Test config server entries"""
+        out = self.get_data_file('ntp_conf_servers')
         servers = self.cloud_config.get('ntp').get('servers')
         for server in servers:
             self.assertIn('server %s iburst' % server, out)