cloud-init

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

  1. Git
  2. lp:~powersj/cloud-init
  3. fix-integration-ntp
  4. Merge into master
Proposed by Joshua Powers
Status: Merged
Merged at revision: 9fa17d4bc1ef2564e30ab655bf6de462296aecad
Proposed branch: ~powersj/cloud-init:fix-integration-ntp
Merge into: cloud-init:master
Diff against target: 17 lines (+3/-3)
1 file modified
tests/cloud_tests/testcases/modules/ntp_servers.py (+3/-3)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Scott Moser Needs Fixing
Ryan Harper Approve
Review via email: mp+324429@code.launchpad.net

Commit message

tests: Fix ntp integration test regression

LP: #1692686

To post a comment you must log in.
Revision history for this message
Ryan Harper (raharper) wrote :

Thank you for finding/fixing my merge error.

review: Approve
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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)
Revision history for this message
Scott Moser (smoser) wrote :

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
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/cloud_tests/testcases/modules/ntp_servers.py b/tests/cloud_tests/testcases/modules/ntp_servers.py
2index 9ef270e..4010cf8 100644
3--- a/tests/cloud_tests/testcases/modules/ntp_servers.py
4+++ b/tests/cloud_tests/testcases/modules/ntp_servers.py
5@@ -17,9 +17,9 @@ class TestNtpServers(base.CloudTestCase):
6 out = self.get_data_file('ntp_conf_dist_servers')
7 self.assertEqual(0, int(out))
8
9- def test_ntp_entires(self):
10- """Test config pools entries"""
11- out = self.get_data_file('ntp_conf_pools')
12+ def test_ntp_entries(self):
13+ """Test config server entries"""
14+ out = self.get_data_file('ntp_conf_servers')
15 servers = self.cloud_config.get('ntp').get('servers')
16 for server in servers:
17 self.assertIn('server %s iburst' % server, out)

Subscribers

People subscribed via source and target branches