diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-06-07 21:23:38 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-06-15 11:56:04 +0200 |
| commit | 576cbb771aafce4a1aeceb9ee99bffbdd63164e7 (patch) | |
| tree | bb9fd749c6fb3f5cfbb9ad6d1b86b6a1664118fe /clients | |
| parent | 4e7ae3da6e862ec60a7c8263783b29cdf086c22e (diff) | |
| download | NetworkManager-576cbb771aafce4a1aeceb9ee99bffbdd63164e7.tar.gz | |
libnm: always return VPN connections's banner
It's not libnm's responsibility to hide the banner
depending on the VPN state. libnm should cache and expose
NetworkManager's state, and if the VPN connection has
a banner there, it should be returned.
The previous behavior was since ever in libnm, and in libnm-glib since
the banner was introduced in commit e5b834c1f9c6f6e92546695a14bc37ec7aec09c6.
I think it's wrong if libnm tries too hard putting additional logic
on top of what is on D-Bus.
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/tests/test-client.check-on-disk/test_004-021.expected | 4 | ||||
| -rw-r--r-- | clients/tests/test-client.check-on-disk/test_004-022.expected | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clients/tests/test-client.check-on-disk/test_004-021.expected b/clients/tests/test-client.check-on-disk/test_004-021.expected index 80be0fc8a7..5cc7aa7315 100644 --- a/clients/tests/test-client.check-on-disk/test_004-021.expected +++ b/clients/tests/test-client.check-on-disk/test_004-021.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:945:test_004()/21 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 -stdout: 4326 bytes +stdout: 4356 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -90,7 +90,7 @@ GENERAL.MASTER-PATH: -- VPN.TYPE: openvpn VPN.USERNAME: -- VPN.GATEWAY: -- -VPN.BANNER: -- +VPN.BANNER: *** VPN connection con-vpn-1 *** VPN.VPN-STATE: 0 - unknown VPN.CFG[1]: key1 = val1 VPN.CFG[2]: key2 = val2 diff --git a/clients/tests/test-client.check-on-disk/test_004-022.expected b/clients/tests/test-client.check-on-disk/test_004-022.expected index 630ff498db..17b3094e96 100644 --- a/clients/tests/test-client.check-on-disk/test_004-022.expected +++ b/clients/tests/test-client.check-on-disk/test_004-022.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:945:test_004()/22 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4340 bytes +stdout: 4370 bytes >>> connection.id: con-vpn-1 connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP @@ -90,7 +90,7 @@ GENERAL.MASTER-PATH: -- VPN.TYPE: openvpn VPN.USERNAME: -- VPN.GATEWAY: -- -VPN.BANNER: -- +VPN.BANNER: *** VPN connection con-vpn-1 *** VPN.VPN-STATE: 0 - nieznane VPN.CFG[1]: key1 = val1 VPN.CFG[2]: key2 = val2 |