Handle multiple servers in ntp test.

tests/test_ntp.py

@@ -12,17 +12,17 @@ import imp
 
 # Check that ntpd is synced
 if os.path.isfile('/usr/bin/ntpq'):
-    cmd = "LANG=C ntpq -pd"
-    expected = "remote"
+    cmd = 'LANG=C ntpq -pd'
+    expected = 'remote'
     ntpconf = '/etc/ntp.conf'
     ntpconf_expected = 'server '
 else:
-    cmd = "LANG=C timedatectl"
+    cmd = 'LANG=C timedatectl'
     expected = 'NTP synchronized'
     ntpconf = '/etc/systemd/timesyncd.conf'
     ntpconf_expected = 'NTP='
 
-print("Running %s" % cmd)
+print('Running %s' % cmd)
 status = subprocess.getoutput(cmd)
 if expected not in status:
     print('NTP not working: %s' % status)
@@ -36,19 +36,21 @@ print('Checking NTP server conforms to conf')
 if os.path.isfile('../utils.py'):
     es_utils = imp.load_source('es_utils', '../utils.py')
     conf = es_utils.load_conf()
-    NTP_SERVER = conf.get('NTP_SERVER') or 'ntp.ubuntu.com'
+    expected_servers = (conf.get('NTP_SERVER') or 'ntp.ubuntu.com').split(',')
 
     with open(ntpconf, 'r') as f:
         d = f.read()
         servers = list()
         for l in d.split('\n'):
             if l.startswith(ntpconf_expected):
-                servers.append(l.split(ntpconf_expected)[1])
-        if not '%s%s' % (ntpconf_expected, NTP_SERVER) in d:
-            print('Expected NTP server %s not found in %s, found %s instead' % (NTP_SERVER, ntpconf, servers))
-            sys.exit(1)
-        else:
-            print('Expected NTP server %s found in configuration (total servers: %s)' % (NTP_SERVER, len(servers)))
+                servers.append(l[len(ntpconf_expected):])
+        for expected_server in expected_servers:
+            if expected_server not in servers:
+                print('Expected NTP server %s not found in %s, found %s instead.' % (expected_server, ntpconf, servers))
+                sys.exit(1)
+            else:
+                print('Expected NTP server %s found in configuration (total servers: %s).' % (expected_server, len(servers)))
+    print('NTP OK')
 else:
-    print('Could not find envsetup conf file or not running from expected location')
+    print('Could not find envsetup conf file or not running from expected location.')
     sys.exit(1)