system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

dispatcher/tests: fix test after adding NM_DISPATCHER_ACTION

Browse source 
Also, fix existing tests regarding connectivity action.

Fixes: ce9619047c
This commit is contained in:
Thomas Haller 2018-06-18 14:32:10 +02:00
parent ce9619047c
commit 6dec8ea9f3
8 changed files with 10 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dispatcher/tests/dispatcher-connectivity-full
View file

@ -1,6 +1,5 @@
[main]
action=connectiviy-change
expected-iface=wlan0
action=connectivity-change
uuid=3fd2a33a-d81b-423f-ae99-e6baba742311
id=Random Connection
connectivity-state=FULL
@ -14,10 +13,5 @@ path=/org/freedesktop/NetworkManager/Devices/0
[env]
PATH=
CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
CONNECTION_ID=Random Connection
CONNECTION_FILENAME=/dispatcher/tests/dispatcher-connectivity-full
DEVICE_IFACE=wlan0
DEVICE_IP_IFACE=wlan0
NM_DISPATCHER_ACTION=connectivity-change
CONNECTIVITY_STATE=FULL

10
dispatcher/tests/dispatcher-connectivity-unknown
View file

@ -1,6 +1,5 @@
[main]
action=connectiviy-change
expected-iface=wlan0
action=connectivity-change
uuid=3fd2a33a-d81b-423f-ae99-e6baba742311
id=Random Connection
connectivity-state=UNKNOWN
@ -14,9 +13,4 @@ path=/org/freedesktop/NetworkManager/Devices/0
[env]
PATH=
CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
CONNECTION_ID=Random Connection
CONNECTION_FILENAME=/dispatcher/tests/dispatcher-connectivity-unknown
DEVICE_IFACE=wlan0
DEVICE_IP_IFACE=wlan0
NM_DISPATCHER_ACTION=connectivity-change

1
dispatcher/tests/dispatcher-down
View file

@ -13,6 +13,7 @@ path=/org/freedesktop/NetworkManager/Devices/0
[env]
PATH=
NM_DISPATCHER_ACTION=down
CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
CONNECTION_ID=Random Connection

1
dispatcher/tests/dispatcher-external
View file

@ -23,6 +23,7 @@ gateway=0.0.0.0
[env]
PATH=
NM_DISPATCHER_ACTION=up
CONNECTION_UUID=92bbc2fb-7304-46be-8ebb-6093dbe19a6a
CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
CONNECTION_FILENAME=/dispatcher/tests/dispatcher-external

1
dispatcher/tests/dispatcher-up
View file

@ -36,6 +36,7 @@ domains=hsd1.mn.comcast.net.
[env]
PATH=
NM_DISPATCHER_ACTION=up
CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311
CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
CONNECTION_ID=Random Connection

1
dispatcher/tests/dispatcher-vpn-down
View file

@ -36,6 +36,7 @@ domains=hsd1.mn.comcast.net.
[env]
PATH=
NM_DISPATCHER_ACTION=vpn-down
CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
CONNECTION_ID=Random Connection

1
dispatcher/tests/dispatcher-vpn-up
View file

@ -36,6 +36,7 @@ domains=hsd1.mn.comcast.net.
[env]
PATH=
NM_DISPATCHER_ACTION=vpn-up
CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e
CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5
CONNECTION_ID=Random Connection

4
dispatcher/tests/test-dispatcher-envp.c
View file

@ -66,9 +66,7 @@ parse_main (GKeyFile *kf,
NMSettingConnection *s_con;
GVariantBuilder props;
*out_expected_iface = g_key_file_get_string (kf, "main", "expected-iface", error);
if (*out_expected_iface == NULL)
return FALSE;
*out_expected_iface = g_key_file_get_string (kf, "main", "expected-iface", NULL);
*out_connectivity_state = g_key_file_get_string (kf, "main", "connectivity-state", NULL);
*out_vpn_ip_iface = g_key_file_get_string (kf, "main", "vpn-ip-iface", NULL);