diff options
Diffstat (limited to 'smoketest/scripts/cli')
| -rwxr-xr-x | smoketest/scripts/cli/test_service_dhcp-server.py | 26 | 
1 files changed, 15 insertions, 11 deletions
| diff --git a/smoketest/scripts/cli/test_service_dhcp-server.py b/smoketest/scripts/cli/test_service_dhcp-server.py index 3dbd06381..a8f08dc6a 100755 --- a/smoketest/scripts/cli/test_service_dhcp-server.py +++ b/smoketest/scripts/cli/test_service_dhcp-server.py @@ -95,6 +95,10 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):              self.assertTrue(key in base_obj)              self.assertEqual(base_obj[key], value) +    def verify_service_running(self): +        tmp = cmd('tail -n 100 /var/log/messages | grep kea') +        self.assertTrue(process_named_running(PROCESS_NAME), msg=f'Service not running, log: {tmp}') +      def test_dhcp_single_pool_range(self):          shared_net_name = 'SMOKE-1' @@ -198,7 +202,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):          )          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_single_pool_options(self):          shared_net_name = 'SMOKE-0815' @@ -367,7 +371,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):          )          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_single_pool_options_scoped(self):          shared_net_name = 'SMOKE-2' @@ -453,7 +457,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):          )          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_single_pool_static_mapping(self):          shared_net_name = 'SMOKE-2' @@ -599,7 +603,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):              client_base += 1          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_multiple_pools(self):          lease_time = '14400' @@ -741,7 +745,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):                  client_base += 1          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_exclude_not_in_range(self):          # T3180: verify else path when slicing DHCP ranges and exclude address @@ -788,7 +792,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):          )          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_exclude_in_range(self):          # T3180: verify else path when slicing DHCP ranges and exclude address @@ -851,7 +855,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):          )          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_relay_server(self):          # Listen on specific address and return DHCP leases from a non @@ -899,7 +903,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):          )          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_high_availability(self):          shared_net_name = 'FAILOVER' @@ -1002,7 +1006,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):          )          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_high_availability_standby(self):          shared_net_name = 'FAILOVER' @@ -1101,7 +1105,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):          )          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()      def test_dhcp_on_interface_with_vrf(self):          self.cli_set(['interfaces', 'ethernet', 'eth1', 'address', '10.1.1.1/30']) @@ -1263,7 +1267,7 @@ class TestServiceDHCPServer(VyOSUnitTestSHIM.TestCase):          )          # Check for running process -        self.assertTrue(process_named_running(PROCESS_NAME)) +        self.verify_service_running()          # All up and running, now test vyos-hostsd store | 
