smoketest: add shim for every test to re-use common tasts

Currently every smoketest does the setup and destruction of the configsession
on its own durin setUp(). This creates a lot of overhead and one configsession
should be re-used during execution of every smoketest script.

In addiion a test that failed will leaf the system in an unconsistent state.
For this reason before the test is executed we will save the running config
to /tmp and the will re-load the config after the test has passed, always
ensuring a clean environment for the next test.

1 files changed, 14 insertions, 13 deletions

diff --git a/smoketest/scripts/cli/test_interfaces_wirelessmodem.py b/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
index 023f57305..c36835ea7 100755
--- a/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
+++ b/smoketest/scripts/cli/test_interfaces_wirelessmodem.py
@@ -18,7 +18,10 @@ import os
 import unittest
 
 from psutil import process_iter
-from vyos.configsession import ConfigSession, ConfigSessionError
+from base_vyostest_shim import VyOSUnitTestSHIM
+
+from vyos.configsession import ConfigSession
+from vyos.configsession import ConfigSessionError
 
 config_file = '/etc/ppp/peers/{}'
 base_path = ['interfaces', 'wirelessmodem']
@@ -30,33 +33,31 @@ def get_config_value(interface, key):
                 return list(line.split())
     return []
 
-class WWANInterfaceTest(unittest.TestCase):
+class WWANInterfaceTest(VyOSUnitTestSHIM.TestCase):
     def setUp(self):
-        self.session = ConfigSession(os.getpid())
         self._interfaces = ['wlm0', 'wlm1']
 
     def tearDown(self):
-        self.session.delete(base_path)
-        self.session.commit()
-        del self.session
+        self.cli_delete(base_path)
+        self.cli_commit()
 
     def test_wwan(self):
         for interface in self._interfaces:
-            self.session.set(base_path + [interface, 'no-peer-dns'])
-            self.session.set(base_path + [interface, 'connect-on-demand'])
+            self.cli_set(base_path + [interface, 'no-peer-dns'])
+            self.cli_set(base_path + [interface, 'connect-on-demand'])
 
             # check validate() - APN must be configure
             with self.assertRaises(ConfigSessionError):
-                self.session.commit()
-            self.session.set(base_path + [interface, 'apn', 'vyos.net'])
+                self.cli_commit()
+            self.cli_set(base_path + [interface, 'apn', 'vyos.net'])
 
             # check validate() - device must be configure
             with self.assertRaises(ConfigSessionError):
-                self.session.commit()
-            self.session.set(base_path + [interface, 'device', 'ttyS0'])
+                self.cli_commit()
+            self.cli_set(base_path + [interface, 'device', 'ttyS0'])
 
             # commit changes
-            self.session.commit()
+            self.cli_commit()
 
         # verify configuration file(s)
         for interface in self._interfaces: