tests: update ntp tests after sntp added

Recent change to ntp in artful has added the sntp package whenever
ntp is installed. The tests, rather poorly, did a dpkg -l instead
of checking with `which`. This fixes the ntp tests to all use
`which` over expecting a certain number of lines using dpkg and
as a result make the tests OS independent.

3 files changed, 6 insertions, 9 deletions

diff --git a/tests/cloud_tests/testcases/modules/ntp.py b/tests/cloud_tests/testcases/modules/ntp.py
index a4b8c3d8..b50e52fe 100644
--- a/tests/cloud_tests/testcases/modules/ntp.py
+++ b/tests/cloud_tests/testcases/modules/ntp.py
@@ -9,8 +9,8 @@ class TestNtp(base.CloudTestCase):
 
     def test_ntp_installed(self):
         """Test ntp installed"""
-        out = self.get_data_file('ntp_installed_empty')
-        self.assertEqual(1, int(out))
+        out = self.get_data_file('ntp_installed')
+        self.assertEqual(0, int(out))
 
     def test_ntp_dist_entries(self):
         """Test dist config file is empty"""
@@ -19,10 +19,7 @@ class TestNtp(base.CloudTestCase):
 
     def test_ntp_entires(self):
         """Test config entries"""
-        out = self.get_data_file('ntp_conf_empty')
-        self.assertIn('pool 0.ubuntu.pool.ntp.org iburst', out)
-        self.assertIn('pool 1.ubuntu.pool.ntp.org iburst', out)
-        self.assertIn('pool 2.ubuntu.pool.ntp.org iburst', out)
-        self.assertIn('pool 3.ubuntu.pool.ntp.org iburst', out)
+        out = self.get_data_file('ntp_conf_pool_list')
+        self.assertIn('pool.ntp.org iburst', out)
 
 # vi: ts=4 expandtab
diff --git a/tests/cloud_tests/testcases/modules/ntp_pools.py b/tests/cloud_tests/testcases/modules/ntp_pools.py
index 336076df..152fd3f1 100644
--- a/tests/cloud_tests/testcases/modules/ntp_pools.py
+++ b/tests/cloud_tests/testcases/modules/ntp_pools.py
@@ -10,7 +10,7 @@ class TestNtpPools(base.CloudTestCase):
     def test_ntp_installed(self):
         """Test ntp installed"""
         out = self.get_data_file('ntp_installed_pools')
-        self.assertEqual(1, int(out))
+        self.assertEqual(0, int(out))
 
     def test_ntp_dist_entries(self):
         """Test dist config file is empty"""
diff --git a/tests/cloud_tests/testcases/modules/ntp_servers.py b/tests/cloud_tests/testcases/modules/ntp_servers.py
index 4010cf80..8d2a68b3 100644
--- a/tests/cloud_tests/testcases/modules/ntp_servers.py
+++ b/tests/cloud_tests/testcases/modules/ntp_servers.py
@@ -10,7 +10,7 @@ class TestNtpServers(base.CloudTestCase):
     def test_ntp_installed(self):
         """Test ntp installed"""
         out = self.get_data_file('ntp_installed_servers')
-        self.assertEqual(1, int(out))
+        self.assertEqual(0, int(out))
 
     def test_ntp_dist_entries(self):
         """Test dist config file is empty"""