fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-18 21:11:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test-client: cleanup start/shutdown of stub service

Browse source
This commit is contained in:
Thomas Haller 2023-02-07 11:56:38 +01:00
parent b08f7a9c19
commit 3e574dda22
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/tests/client/test-client.py
View file

@ -754,6 +754,16 @@ MAX_JOBS = 15
class TestNmcli(NmTestBase):
def srv_start(self):
self.srv_shutdown()
self.srv = NMStubServer(self._testMethodName)
def srv_shutdown(self):
if self.srv is not None:
srv = self.srv
self.srv = None
srv.shutdown()
def ReplaceTextConUuid(self, con_name, replacement):
return Util.ReplaceTextSimple(
Util.memoize_nullary(lambda: self.srv.findConnectionUuid(con_name)),
@ -1130,9 +1140,7 @@ class TestNmcli(NmTestBase):
self.async_wait()
if self.srv is not None:
self.srv.shutdown()
self.srv = None
self.srv_shutdown()
self._calling_num = None
@ -1248,7 +1256,7 @@ class TestNmcli(NmTestBase):
def nm_test(func):
def f(self):
self.srv = NMStubServer(self._testMethodName)
self.srv_start()
func(self)
self._nm_test_post()
@ -1935,8 +1943,7 @@ class TestNmcli(NmTestBase):
end_mon(nmc)
nmc = start_mon()
self.srv.shutdown()
self.srv = None
self.srv_shutdown()
nmc.expect("eth0: device removed")
nmc.expect("con-1: connection profile removed")
nmc.expect("NetworkManager is stopped")