Merge pull request #4803 from c-po/smoketest-call-base-class

T7948: always call setUp() and tearDown() base class methods

Author: c-po

smoketest/scripts/cli/base_accel_ppp_test.py

@@ -46,6 +46,8 @@ def setUp(self):
             # ensure we can also run this test on a live system - so lets clean
             # out the current configuration :)
             self.cli_delete(self._base_path)
+            # always forward to base class
+            super().setUp()
 
         def tearDown(self):
             # Check for running process
@@ -56,6 +58,8 @@ def tearDown(self):
 
             # Check for running process
             self.assertFalse(process_named_running(self._process_name))
+            # always forward to base class
+            super().tearDown()
 
         def set(self, path):
             self.cli_set(self._base_path + path)

smoketest/scripts/cli/base_interfaces_test.py

@@ -217,6 +217,9 @@ def tearDown(self):
                 else:
                     self.assertFalse(process_named_running(daemon))
 
+            # always forward to base class
+            super().tearDown()
+
         def test_dhcp_disable_interface(self):
             if not self._test_dhcp:
                 self.skipTest(MSG_TESTCASE_UNSUPPORTED)

smoketest/scripts/cli/base_vyostest_shim.py

@@ -23,11 +23,13 @@
 from time import sleep
 from typing import Type
 
+from vyos import ConfigError
 from vyos.configsession import ConfigSession
 from vyos.configsession import ConfigSessionError
-from vyos import ConfigError
 from vyos.defaults import commit_lock
+from vyos.frrender import mgmt_daemon
 from vyos.utils.process import cmd
+from vyos.utils.process import process_named_running
 from vyos.utils.process import run
 
 save_config = '/tmp/vyos-smoketest-save'
@@ -42,11 +44,11 @@
 
 class VyOSUnitTestSHIM:
     class TestCase(unittest.TestCase):
-        # if enabled in derived class, print out each and every set/del command
-        # on the CLI. This is usefull to grap all the commands required to
-        # trigger the certain failure condition.
-        # Use "self.debug = True" in derived classes setUp() method
+        # If enabled, print out each and every set/del command on stdout.
+        # This is usefull to grap all the commands required to trigger the
+        # certain failure condition.
         debug = False
+        mgmt_daemon_pid = 0
 
         @staticmethod
         def debug_on():
@@ -68,7 +70,10 @@ def setUpClass(cls):
             cls._session = ConfigSession(os.getpid())
             cls._session.save_config(save_config)
             cls.debug = cls.debug_on()
-            pass
+
+            # Retrieve FRR mgmtd daemon PID - it is not allowed to crash, thus
+            # PID must remain the same
+            cls.mgmt_daemon_pid = process_named_running(mgmt_daemon)
 
         @classmethod
         def tearDownClass(cls):
@@ -83,6 +88,13 @@ def tearDownClass(cls):
                 cls._session.discard()
                 cls.fail(cls)
 
+        def setUp(self):
+            pass
+
+        def tearDown(self):
+            # check process health and continuity
+            self.assertEqual(self.mgmt_daemon_pid, process_named_running(mgmt_daemon))
+
         def cli_set(self, path, value=None):
             if self.debug:
                 str = f'set {" ".join(path)} {value}' if value else f'set {" ".join(path)}'

smoketest/scripts/cli/test_cgnat.py

@@ -37,6 +37,9 @@ def tearDown(self):
         self.cli_commit()
         self.assertFalse(os.path.exists(nftables_cgnat_config))
 
+        # always forward to base class
+        super().tearDown()
+
     def test_cgnat(self):
         internal_name = 'vyos-int-01'
         external_name = 'vyos-ext-01'

smoketest/scripts/cli/test_config_save.py

@@ -96,4 +96,4 @@ def test_disk_resident_atomic(self):
 
 
 if __name__ == '__main__':
-    unittest.main(verbosity=2)
+    unittest.main(verbosity=2, failfast=VyOSUnitTestSHIM.TestCase.debug_on())

smoketest/scripts/cli/test_configd_init.py

@@ -22,20 +22,26 @@
 from vyos.utils.process import is_systemd_service_running
 from vyos.utils.process import cmd
 
+service_name = 'vyos-configd.service'
+
 class TestConfigdInit(unittest.TestCase):
     def setUp(self):
-        self.running_state = is_systemd_service_running('vyos-configd.service')
+        self.running_state = is_systemd_service_running(service_name)
+        # always forward to base class
+        super().setUp()
+
+    def tearDown(self):
+        if not self.running_state:
+            cmd(f'sudo systemctl stop {service_name}')
+        # always forward to base class
+        super().tearDown()
 
     def test_configd_init(self):
         if not self.running_state:
-            cmd('sudo systemctl start vyos-configd.service')
+            cmd(f'sudo systemctl start {service_name}')
             # allow time for init to succeed/fail
             sleep(2)
-            self.assertTrue(is_systemd_service_running('vyos-configd.service'))
-
-    def tearDown(self):
-        if not self.running_state:
-            cmd('sudo systemctl stop vyos-configd.service')
+            self.assertTrue(is_systemd_service_running(service_name))
 
 if __name__ == '__main__':
     unittest.main(verbosity=2, failfast=VyOSUnitTestSHIM.TestCase.debug_on())

smoketest/scripts/cli/test_container.py

@@ -33,13 +33,11 @@
 busybox_image = 'busybox:stable'
 busybox_image_path = '/usr/share/vyos/busybox-stable.tar'
 
-
 def cmd_to_json(command):
     c = cmd(command + ' --format=json')
     data = json.loads(c)[0]
     return data
 
-
 class TestContainer(VyOSUnitTestSHIM.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -70,6 +68,8 @@ def tearDown(self):
         # Ensure systemd units are removed
         units = glob.glob('/run/systemd/system/vyos-container-*')
         self.assertEqual(units, [])
+        # always forward to base class
+        super().tearDown()
 
     def test_basic(self):
         cont_name = 'c1'
@@ -242,7 +242,7 @@ def test_user_defined_mac(self):
         self.assertEqual(n['NetworkSettings']['Networks']['bridge1']['MacAddress'], '02:00:00:00:00:01')
         n = cmd_to_json(f'sudo podman container inspect test2')
         self.assertEqual(n['NetworkSettings']['Networks']['bridge1']['MacAddress'], '02:00:00:00:00:02')
-    
+
     def test_ipv4_network(self):
         prefix = '192.0.2.0/24'
         base_name = 'ipv4'

smoketest/scripts/cli/test_firewall.py

@@ -71,6 +71,8 @@ def tearDown(self):
         ]
 
         self.verify_nftables(nftables_search, 'ip vyos_filter', inverse=True)
+        # always forward to base class
+        super().tearDown()
 
     def wait_for_domain_resolver(self, table, set_name, element, max_wait=10):
         # Resolver no longer blocks commit, need to wait for daemon to populate set

smoketest/scripts/cli/test_high-availability_virtual-server.py

@@ -38,6 +38,8 @@ def tearDown(self):
 
         # Process must be terminated after deleting the config
         self.assertFalse(process_named_running(PROCESS_NAME))
+        # always forward to base class
+        super().tearDown()
 
     def test_01_ha_virtual_server(self):
         algo = 'least-connection'

smoketest/scripts/cli/test_high-availability_vrrp.py

@@ -50,6 +50,8 @@ def tearDown(self):
 
         # Process must be terminated after deleting the config
         self.assertFalse(process_named_running(PROCESS_NAME))
+        # always forward to base class
+        super().tearDown()
 
     def test_01_default_values(self):
         for group in groups: