smoketest: accel-ppp: revise base class to reduce amout of redundant code

1 files changed, 8 insertions, 15 deletions

diff --git a/smoketest/scripts/cli/test_service_pppoe-server.py b/smoketest/scripts/cli/test_service_pppoe-server.py
index fae16d3b3..17687a26b 100755
--- a/smoketest/scripts/cli/test_service_pppoe-server.py
+++ b/smoketest/scripts/cli/test_service_pppoe-server.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 020 VyOS maintainers and contributors
+# Copyright (C) 2022 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -14,14 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import unittest
 
 from base_accel_ppp_test import BasicAccelPPPTest
 
 from configparser import ConfigParser
 from vyos.configsession import ConfigSessionError
-from vyos.util import process_named_running
 from vyos.util import read_file
 from vyos.template import range_to_regex
 
@@ -30,24 +28,19 @@ ac_name = 'ACN'
 interface = 'eth0'
 
 class TestServicePPPoEServer(BasicAccelPPPTest.TestCase):
-    def setUp(self):
-        self._base_path = ['service', 'pppoe-server']
-        self._process_name = 'accel-pppd'
-        self._config_file = '/run/accel-pppd/pppoe.conf'
-        self._chap_secrets = '/run/accel-pppd/pppoe.chap-secrets'
+    @classmethod
+    def setUpClass(cls):
+        cls._base_path = ['service', 'pppoe-server']
+        cls._config_file = '/run/accel-pppd/pppoe.conf'
+        cls._chap_secrets = '/run/accel-pppd/pppoe.chap-secrets'
 
-        super().setUp()
+        # call base-classes classmethod
+        super(TestServicePPPoEServer, cls).setUpClass()
 
     def tearDown(self):
-        # Check for running process
-        self.assertTrue(process_named_running(self._process_name))
-
         self.cli_delete(local_if)
         super().tearDown()
 
-        # Check for running process
-        self.assertFalse(process_named_running(self._process_name))
-
     def verify(self, conf):
         mtu = '1492'