fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 09:30:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test-client: move TestNmClient.ReplaceTextConUuid() to NMStubServer

Browse source 
The goal is to make the base class TestNmClient smaller because it
contains a lot of state, and with inheritance it's hard to follow what
happens.
This commit is contained in:
Thomas Haller 2023-05-11 11:09:07 +02:00
parent 1c32b59ebd
commit 50f97307c5
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -948,6 +948,12 @@ class NMStubServer:
)
return u
def ReplaceTextConUuid(self, con_name, replacement):
return Util.ReplaceTextSimple(
Util.memoize_nullary(lambda: self.findConnectionUuid(con_name)),
replacement,
)
def setProperty(self, path, propname, value, iface_name=None):
if iface_name is None:
iface_name = ""
@ -1066,12 +1072,6 @@ class TestNmClient(unittest.TestCase):
self.srv = None
srv.shutdown()
def ReplaceTextConUuid(self, con_name, replacement):
return Util.ReplaceTextSimple(
Util.memoize_nullary(lambda: self.srv.findConnectionUuid(con_name)),
replacement,
)
def async_start(self, wait_all=False):
while True:
@ -1590,7 +1590,9 @@ class TestNmcli(TestNmClient):
replace_uuids = []
replace_uuids.append(
self.ReplaceTextConUuid("con-xx1", "UUID-con-xx1-REPLACED-REPLACED-REPLA")
self.srv.ReplaceTextConUuid(
"con-xx1", "UUID-con-xx1-REPLACED-REPLACED-REPLA"
)
)
self.call_nmcli(
@ -1603,7 +1605,7 @@ class TestNmcli(TestNmClient):
for con_name, apn in con_gsm_list:
replace_uuids.append(
self.ReplaceTextConUuid(
self.srv.ReplaceTextConUuid(
con_name, "UUID-" + con_name + "-REPLACED-REPLACED-REPL"
)
)
@ -1635,7 +1637,9 @@ class TestNmcli(TestNmClient):
)
replace_uuids.append(
self.ReplaceTextConUuid("ethernet", "UUID-ethernet-REPLACED-REPLACED-REPL")
self.srv.ReplaceTextConUuid(
"ethernet", "UUID-ethernet-REPLACED-REPLACED-REPL"
)
)
self.call_nmcli(
@ -1764,7 +1768,9 @@ class TestNmcli(TestNmClient):
replace_uuids = []
replace_uuids.append(
self.ReplaceTextConUuid("con-xx1", "UUID-con-xx1-REPLACED-REPLACED-REPLA")
self.srv.ReplaceTextConUuid(
"con-xx1", "UUID-con-xx1-REPLACED-REPLACED-REPLA"
)
)
self.call_nmcli(
@ -1810,7 +1816,9 @@ class TestNmcli(TestNmClient):
self.async_wait()
replace_uuids.append(
self.ReplaceTextConUuid("con-vpn-1", "UUID-con-vpn-1-REPLACED-REPLACED-REP")
self.srv.ReplaceTextConUuid(
"con-vpn-1", "UUID-con-vpn-1-REPLACED-REPLACED-REP"
)
)
self.call_nmcli(