fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 14:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: support UInt64 type in test-networkmanager-service.py

Browse source 
and also accept "gsm" connection-type. Both will be used next.
This commit is contained in:
Thomas Haller 2018-10-17 13:56:09 +02:00
parent 085105fc0e
commit 0f503efd64
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/test-networkmanager-service.py
View file

@ -281,6 +281,8 @@ class Util:
return GLib.Variant('s', str(val)) return GLib.Variant('s', str(val))
if isinstance(val, dbus.UInt32): if isinstance(val, dbus.UInt32):
return GLib.Variant('u', int(val)) return GLib.Variant('u', int(val))
if isinstance(val, dbus.UInt64):
return GLib.Variant('t', int(val))
if isinstance(val, dbus.Boolean): if isinstance(val, dbus.Boolean):
return GLib.Variant('b', bool(val)) return GLib.Variant('b', bool(val))
if isinstance(val, dbus.Byte): if isinstance(val, dbus.Byte):
@ -481,11 +483,12 @@ class NmUtil:
if not do_verify_strict: if not do_verify_strict:
return; return;
t = s_con[NM.SETTING_CONNECTION_TYPE] t = s_con[NM.SETTING_CONNECTION_TYPE]
if t not in [ NM.SETTING_WIRED_SETTING_NAME, if t not in [ NM.SETTING_GSM_SETTING_NAME,
NM.SETTING_WIRELESS_SETTING_NAME,
NM.SETTING_VLAN_SETTING_NAME, NM.SETTING_VLAN_SETTING_NAME,
NM.SETTING_VPN_SETTING_NAME,
NM.SETTING_WIMAX_SETTING_NAME, NM.SETTING_WIMAX_SETTING_NAME,
NM.SETTING_VPN_SETTING_NAME ]: NM.SETTING_WIRED_SETTING_NAME,
NM.SETTING_WIRELESS_SETTING_NAME ]:
raise BusErr.InvalidPropertyException('connection.type: unsupported connection type "%s"' % (t)) raise BusErr.InvalidPropertyException('connection.type: unsupported connection type "%s"' % (t))
try: try: