← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~smoser/cloud-init:fix/ntp-test-no-dns into cloud-init:master

 

Scott Moser has proposed merging ~smoser/cloud-init:fix/ntp-test-no-dns into cloud-init:master.

Commit message:
tests: when querying ntp server, do not do dns resolution.

Tests run on EC2 would successfully resolve the ipv4 dns address
and that caused false positives on failure reports.

Basically, dns lookup of 172.16.15.14 would return
  ip-172-16-15-14.us-east-2.compute.internal.
which then shows up in the ntpq output unless you provide -n.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~smoser/cloud-init/+git/cloud-init/+merge/336458

see commit message
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~smoser/cloud-init:fix/ntp-test-no-dns into cloud-init:master.
diff --git a/tests/cloud_tests/testcases/modules/ntp_pools.yaml b/tests/cloud_tests/testcases/modules/ntp_pools.yaml
index 3a93faa..d490b22 100644
--- a/tests/cloud_tests/testcases/modules/ntp_pools.yaml
+++ b/tests/cloud_tests/testcases/modules/ntp_pools.yaml
@@ -26,6 +26,6 @@ collect_scripts:
     grep '^pool' /etc/ntp.conf
   ntpq_servers: |
     #!/bin/sh
-    ntpq -p -w
+    ntpq -p -w -n
 
 # vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_servers.yaml b/tests/cloud_tests/testcases/modules/ntp_servers.yaml
index d59d45a..6b13b70 100644
--- a/tests/cloud_tests/testcases/modules/ntp_servers.yaml
+++ b/tests/cloud_tests/testcases/modules/ntp_servers.yaml
@@ -22,6 +22,6 @@ collect_scripts:
     grep '^server' /etc/ntp.conf
   ntpq_servers: |
     #!/bin/sh
-    ntpq -p -w
+    ntpq -p -w -n
 
 # vi: ts=4 expandtab

Follow ups