smoketest: tftp: do not add/remove interfaces for each testrun, use setUpClass()

1 files changed, 21 insertions, 10 deletions

diff --git a/smoketest/scripts/cli/test_service_tftp-server.py b/smoketest/scripts/cli/test_service_tftp-server.py
index b57c33f26..99d81e203 100755
--- a/smoketest/scripts/cli/test_service_tftp-server.py
+++ b/smoketest/scripts/cli/test_service_tftp-server.py
@@ -33,15 +33,32 @@ address_ipv6 = '2001:db8::1'
 vrf = 'mgmt'
 
 class TestServiceTFTPD(VyOSUnitTestSHIM.TestCase):
-    def setUp(self):
-        self.cli_set(dummy_if_path + ['address', address_ipv4 + '/32'])
-        self.cli_set(dummy_if_path + ['address', address_ipv6 + '/128'])
+    @classmethod
+    def setUpClass(cls):
+        super(TestServiceTFTPD, cls).setUpClass()
+
+        # ensure we can also run this test on a live system - so lets clean
+        # out the current configuration :)
+        cls.cli_delete(cls, base_path)
+
+        cls.cli_set(cls, dummy_if_path + ['address', address_ipv4 + '/32'])
+        cls.cli_set(cls, dummy_if_path + ['address', address_ipv6 + '/128'])
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.cli_delete(cls, dummy_if_path)
+        super(TestServiceTFTPD, cls).tearDownClass()
 
     def tearDown(self):
+        # Check for running process
+        self.assertTrue(process_named_running(PROCESS_NAME))
+
         self.cli_delete(base_path)
-        self.cli_delete(dummy_if_path)
         self.cli_commit()
 
+        # Check for no longer running process
+        self.assertFalse(process_named_running(PROCESS_NAME))
+
     def test_01_tftpd_single(self):
         directory = '/tmp'
         port = '69' # default port
@@ -61,9 +78,6 @@ class TestServiceTFTPD(VyOSUnitTestSHIM.TestCase):
         # verify upload
         self.assertIn('--create --umask 000', config)
 
-        # Check for running process
-        self.assertTrue(process_named_running(PROCESS_NAME))
-
     def test_02_tftpd_multi(self):
         directory = '/tmp'
         address = [address_ipv4, address_ipv6]
@@ -125,9 +139,6 @@ class TestServiceTFTPD(VyOSUnitTestSHIM.TestCase):
         # verify upload
         self.assertIn('--create --umask 000', config)
 
-        # Check for running process
-        self.assertTrue(process_named_running(PROCESS_NAME))
-
         # Check for process in VRF
         tmp = cmd(f'ip vrf pids {vrf}')
         self.assertIn(PROCESS_NAME, tmp)