From 1410dac5c3cd90bdd8f04a3a390d4ccb8b20c784 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 6 Jun 2018 13:18:51 +0200 Subject: [PATCH 1/8] clients/tests: add test for terse output of `nmcli -t connection show $VPN` --- .../test-client.check-on-disk/Makefile.am | 2 + .../test_004-025.expected | 168 ++++++++++-------- .../test_004-026.expected | 168 ++++++++++-------- .../test_004-027.expected | 71 +++++++- .../test_004-028.expected | 71 +++++++- .../test_004-029.expected | 24 +-- .../test_004-030.expected | 24 +-- .../test_004-031.expected | 25 +-- .../test_004-032.expected | 25 +-- .../test_004-033.expected | 61 +------ .../test_004-034.expected | 61 +------ .../test_004-035.expected | 74 ++++++++ .../test_004-036.expected | 74 ++++++++ clients/tests/test-client.py | 2 + 14 files changed, 530 insertions(+), 320 deletions(-) create mode 100644 clients/tests/test-client.check-on-disk/test_004-035.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-036.expected diff --git a/clients/tests/test-client.check-on-disk/Makefile.am b/clients/tests/test-client.check-on-disk/Makefile.am index 7c9cabe8a4..e36654bc8d 100644 --- a/clients/tests/test-client.check-on-disk/Makefile.am +++ b/clients/tests/test-client.check-on-disk/Makefile.am @@ -177,4 +177,6 @@ clients_tests_expected_files = \ clients/tests/test-client.check-on-disk/test_004-032.expected \ clients/tests/test-client.check-on-disk/test_004-033.expected \ clients/tests/test-client.check-on-disk/test_004-034.expected \ + clients/tests/test-client.check-on-disk/test_004-035.expected \ + clients/tests/test-client.check-on-disk/test_004-036.expected \ $(NULL) diff --git a/clients/tests/test-client.check-on-disk/test_004-025.expected b/clients/tests/test-client.check-on-disk/test_004-025.expected index bf7758b000..ef42d6ce51 100644 --- a/clients/tests/test-client.check-on-disk/test_004-025.expected +++ b/clients/tests/test-client.check-on-disk/test_004-025.expected @@ -1,80 +1,100 @@ -location: clients/tests/test-client.py:857:test_004()/25 -cmd: $NMCLI -f ALL con s con-vpn-1 +location: clients/tests/test-client.py:856:test_004()/25 +cmd: $NMCLI -t con s con-vpn-1 lang: C returncode: 0 -stdout: 3274 bytes +stdout: 2131 bytes >>> -connection.id: con-vpn-1 -connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP -connection.stable-id: -- -connection.type: vpn -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -vpn.service-type: org.freedesktop.NetworkManager.openvpn -vpn.user-name: -- -vpn.data: key1 = val1, key2 = val2, key3 = val3 -vpn.secrets: -vpn.persistent: no -vpn.timeout: 0 -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: +connection.type:vpn +connection.interface-name: +connection.autoconnect:yes +connection.autoconnect-priority:0 +connection.autoconnect-retries:-1 +connection.auth-retries:-1 +connection.timestamp:0 +connection.read-only:no +connection.permissions: +connection.zone: +connection.master: +connection.slave-type: +connection.autoconnect-slaves:-1 +connection.secondaries: +connection.gateway-ping-timeout:0 +connection.metered:unknown +connection.lldp:default +connection.mdns:-1 +ipv4.method:auto +ipv4.dns: +ipv4.dns-search: +ipv4.dns-options: +ipv4.dns-priority:0 +ipv4.addresses: +ipv4.gateway: +ipv4.routes: +ipv4.route-metric:-1 +ipv4.route-table:0 +ipv4.ignore-auto-routes:no +ipv4.ignore-auto-dns:no +ipv4.dhcp-client-id: +ipv4.dhcp-timeout:0 +ipv4.dhcp-send-hostname:yes +ipv4.dhcp-hostname: +ipv4.dhcp-fqdn: +ipv4.never-default:no +ipv4.may-fail:yes +ipv4.dad-timeout:-1 +ipv6.method:auto +ipv6.dns: +ipv6.dns-search: +ipv6.dns-options: +ipv6.dns-priority:0 +ipv6.addresses: +ipv6.gateway: +ipv6.routes: +ipv6.route-metric:-1 +ipv6.route-table:0 +ipv6.ignore-auto-routes:no +ipv6.ignore-auto-dns:no +ipv6.never-default:no +ipv6.may-fail:yes +ipv6.ip6-privacy:-1 +ipv6.addr-gen-mode:stable-privacy +ipv6.dhcp-duid: +ipv6.dhcp-send-hostname:yes +ipv6.dhcp-hostname: +ipv6.token: +vpn.service-type:org.freedesktop.NetworkManager.openvpn +vpn.user-name: +vpn.data:key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: +vpn.persistent:no +vpn.timeout:0 +proxy.method:none +proxy.browser-only:no +proxy.pac-url: +proxy.pac-script: +GENERAL.NAME:con-vpn-1 +GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES:wlan0 +GENERAL.STATE:activated +GENERAL.DEFAULT:no +GENERAL.DEFAULT6:no +GENERAL.SPEC-OBJECT: +GENERAL.VPN:yes +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: +GENERAL.MASTER-PATH: +VPN.TYPE:openvpn +VPN.USERNAME: +VPN.GATEWAY: +VPN.BANNER:*** VPN connection con-vpn-1 *** +VPN.VPN-STATE:5 - VPN connected +VPN.CFG[1]:key1 = val1 +VPN.CFG[2]:key2 = val2 +VPN.CFG[3]:key3 = val3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected index 26e2788827..c37f72b6ce 100644 --- a/clients/tests/test-client.check-on-disk/test_004-026.expected +++ b/clients/tests/test-client.check-on-disk/test_004-026.expected @@ -1,80 +1,100 @@ -location: clients/tests/test-client.py:857:test_004()/26 -cmd: $NMCLI -f ALL con s con-vpn-1 +location: clients/tests/test-client.py:856:test_004()/26 +cmd: $NMCLI -t con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3284 bytes +stdout: 2136 bytes >>> -connection.id: con-vpn-1 -connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP -connection.stable-id: -- -connection.type: vpn -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -vpn.service-type: org.freedesktop.NetworkManager.openvpn -vpn.user-name: -- -vpn.data: key1 = val1, key2 = val2, key3 = val3 -vpn.secrets: -vpn.persistent: nie -vpn.timeout: 0 -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- +connection.id:con-vpn-1 +connection.uuid:UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: +connection.type:vpn +connection.interface-name: +connection.autoconnect:yes +connection.autoconnect-priority:0 +connection.autoconnect-retries:-1 +connection.auth-retries:-1 +connection.timestamp:0 +connection.read-only:no +connection.permissions: +connection.zone: +connection.master: +connection.slave-type: +connection.autoconnect-slaves:-1 +connection.secondaries: +connection.gateway-ping-timeout:0 +connection.metered:unknown +connection.lldp:default +connection.mdns:-1 +ipv4.method:auto +ipv4.dns: +ipv4.dns-search: +ipv4.dns-options: +ipv4.dns-priority:0 +ipv4.addresses: +ipv4.gateway: +ipv4.routes: +ipv4.route-metric:-1 +ipv4.route-table:0 +ipv4.ignore-auto-routes:no +ipv4.ignore-auto-dns:no +ipv4.dhcp-client-id: +ipv4.dhcp-timeout:0 +ipv4.dhcp-send-hostname:yes +ipv4.dhcp-hostname: +ipv4.dhcp-fqdn: +ipv4.never-default:no +ipv4.may-fail:yes +ipv4.dad-timeout:-1 +ipv6.method:auto +ipv6.dns: +ipv6.dns-search: +ipv6.dns-options: +ipv6.dns-priority:0 +ipv6.addresses: +ipv6.gateway: +ipv6.routes: +ipv6.route-metric:-1 +ipv6.route-table:0 +ipv6.ignore-auto-routes:no +ipv6.ignore-auto-dns:no +ipv6.never-default:no +ipv6.may-fail:yes +ipv6.ip6-privacy:-1 +ipv6.addr-gen-mode:stable-privacy +ipv6.dhcp-duid: +ipv6.dhcp-send-hostname:yes +ipv6.dhcp-hostname: +ipv6.token: +vpn.service-type:org.freedesktop.NetworkManager.openvpn +vpn.user-name: +vpn.data:key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: +vpn.persistent:no +vpn.timeout:0 +proxy.method:none +proxy.browser-only:no +proxy.pac-url: +proxy.pac-script: +GENERAL.NAME:con-vpn-1 +GENERAL.UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES:wlan0 +GENERAL.STATE:activated +GENERAL.DEFAULT:no +GENERAL.DEFAULT6:no +GENERAL.SPEC-OBJECT: +GENERAL.VPN:yes +GENERAL.DBUS-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: +GENERAL.MASTER-PATH: +VPN.TYPE:openvpn +VPN.USERNAME: +VPN.GATEWAY: +VPN.BANNER:*** VPN connection con-vpn-1 *** +VPN.VPN-STATE:5 - Połączono z VPN +VPN.CFG[1]:key1 = val1 +VPN.CFG[2]:key2 = val2 +VPN.CFG[3]:key3 = val3 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-027.expected b/clients/tests/test-client.check-on-disk/test_004-027.expected index 8f16f02420..2e5852f17a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-027.expected +++ b/clients/tests/test-client.check-on-disk/test_004-027.expected @@ -1,15 +1,80 @@ -location: clients/tests/test-client.py:863:test_004()/27 -cmd: $NMCLI -f VPN con s con-vpn-1 +location: clients/tests/test-client.py:859:test_004()/27 +cmd: $NMCLI -f ALL con s con-vpn-1 lang: C returncode: 0 -stdout: 334 bytes +stdout: 3274 bytes >>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- vpn.service-type: org.freedesktop.NetworkManager.openvpn vpn.user-name: -- vpn.data: key1 = val1, key2 = val2, key3 = val3 vpn.secrets: vpn.persistent: no vpn.timeout: 0 +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-028.expected b/clients/tests/test-client.check-on-disk/test_004-028.expected index 4e8f78eedb..afd7e27e67 100644 --- a/clients/tests/test-client.check-on-disk/test_004-028.expected +++ b/clients/tests/test-client.check-on-disk/test_004-028.expected @@ -1,15 +1,80 @@ -location: clients/tests/test-client.py:863:test_004()/28 -cmd: $NMCLI -f VPN con s con-vpn-1 +location: clients/tests/test-client.py:859:test_004()/28 +cmd: $NMCLI -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 335 bytes +stdout: 3284 bytes >>> +connection.id: con-vpn-1 +connection.uuid: UUID-con-vpn-1-REPLACED-REPLACED-REP +connection.stable-id: -- +connection.type: vpn +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- vpn.service-type: org.freedesktop.NetworkManager.openvpn vpn.user-name: -- vpn.data: key1 = val1, key2 = val2, key3 = val3 vpn.secrets: vpn.persistent: nie vpn.timeout: 0 +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-029.expected b/clients/tests/test-client.check-on-disk/test_004-029.expected index 2c81c0e9d2..b1945db297 100644 --- a/clients/tests/test-client.check-on-disk/test_004-029.expected +++ b/clients/tests/test-client.check-on-disk/test_004-029.expected @@ -1,21 +1,15 @@ -location: clients/tests/test-client.py:866:test_004()/29 -cmd: $NMCLI -f GENERAL con s con-vpn-1 +location: clients/tests/test-client.py:865:test_004()/29 +cmd: $NMCLI -f VPN con s con-vpn-1 lang: C returncode: 0 -stdout: 667 bytes +stdout: 334 bytes >>> -GENERAL.NAME: con-vpn-1 -GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP -GENERAL.DEVICES: wlan0 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: yes -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: +vpn.persistent: no +vpn.timeout: 0 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-030.expected b/clients/tests/test-client.check-on-disk/test_004-030.expected index 9e31d58b17..06ce34164c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-030.expected +++ b/clients/tests/test-client.check-on-disk/test_004-030.expected @@ -1,21 +1,15 @@ -location: clients/tests/test-client.py:866:test_004()/30 -cmd: $NMCLI -f GENERAL con s con-vpn-1 +location: clients/tests/test-client.py:865:test_004()/30 +cmd: $NMCLI -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 670 bytes +stdout: 335 bytes >>> -GENERAL.NAME: con-vpn-1 -GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP -GENERAL.DEVICES: wlan0 -GENERAL.STATE: aktywowano -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: tak -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +vpn.service-type: org.freedesktop.NetworkManager.openvpn +vpn.user-name: -- +vpn.data: key1 = val1, key2 = val2, key3 = val3 +vpn.secrets: +vpn.persistent: nie +vpn.timeout: 0 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-031.expected b/clients/tests/test-client.check-on-disk/test_004-031.expected index 04e137af64..561a9d1c10 100644 --- a/clients/tests/test-client.check-on-disk/test_004-031.expected +++ b/clients/tests/test-client.check-on-disk/test_004-031.expected @@ -1,16 +1,21 @@ -location: clients/tests/test-client.py:869:test_004()/31 -cmd: $NMCLI dev show wlan0 +location: clients/tests/test-client.py:868:test_004()/31 +cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: C returncode: 0 -stdout: 389 bytes +stdout: 667 bytes >>> -GENERAL.DEVICE: wlan0 -GENERAL.TYPE: wifi -GENERAL.HWADDR: 5A:88:5E:B6:90:40 -GENERAL.MTU: 0 -GENERAL.STATE: 20 (unavailable) -GENERAL.CONNECTION: con-vpn-1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: yes +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-032.expected b/clients/tests/test-client.check-on-disk/test_004-032.expected index 6521a34569..fc68846326 100644 --- a/clients/tests/test-client.check-on-disk/test_004-032.expected +++ b/clients/tests/test-client.check-on-disk/test_004-032.expected @@ -1,16 +1,21 @@ -location: clients/tests/test-client.py:869:test_004()/32 -cmd: $NMCLI dev show wlan0 +location: clients/tests/test-client.py:868:test_004()/32 +cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 390 bytes +stdout: 670 bytes >>> -GENERAL.DEVICE: wlan0 -GENERAL.TYPE: wifi -GENERAL.HWADDR: 5A:88:5E:B6:90:40 -GENERAL.MTU: 0 -GENERAL.STATE: 20 (niedostępne) -GENERAL.CONNECTION: con-vpn-1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.NAME: con-vpn-1 +GENERAL.UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.DEVICES: wlan0 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: tak +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-033.expected b/clients/tests/test-client.check-on-disk/test_004-033.expected index 95a96d7603..31ed829921 100644 --- a/clients/tests/test-client.check-on-disk/test_004-033.expected +++ b/clients/tests/test-client.check-on-disk/test_004-033.expected @@ -1,71 +1,16 @@ -location: clients/tests/test-client.py:872:test_004()/33 -cmd: $NMCLI -f all dev show wlan0 +location: clients/tests/test-client.py:871:test_004()/33 +cmd: $NMCLI dev show wlan0 lang: C returncode: 0 -stdout: 2948 bytes +stdout: 389 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi -GENERAL.NM-TYPE: NMDeviceWifi -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- GENERAL.HWADDR: 5A:88:5E:B6:90:40 GENERAL.MTU: 0 GENERAL.STATE: 20 (unavailable) -GENERAL.REASON: 0 (No reason given) -GENERAL.UDI: /sys/devices/virtual/wlan0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: no -GENERAL.NM-MANAGED: yes -GENERAL.AUTOCONNECT: yes -GENERAL.FIRMWARE-MISSING: no -GENERAL.NM-PLUGIN-MISSING: no -GENERAL.PHYS-PORT-ID: -- GENERAL.CONNECTION: con-vpn-1 -GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED: unknown -CAPABILITIES.CARRIER-DETECT: no -CAPABILITIES.SPEED: unknown -CAPABILITIES.IS-SOFTWARE: no -CAPABILITIES.SRIOV: no -WIFI-PROPERTIES.WEP: yes -WIFI-PROPERTIES.WPA: yes -WIFI-PROPERTIES.WPA2: yes -WIFI-PROPERTIES.TKIP: yes -WIFI-PROPERTIES.CCMP: yes -WIFI-PROPERTIES.AP: yes -WIFI-PROPERTIES.ADHOC: yes -WIFI-PROPERTIES.2GHZ: unknown -WIFI-PROPERTIES.5GHZ: unknown -AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infra -AP[1].CHAN: 1 -AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** -AP[1].SECURITY: WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infra -AP[2].CHAN: 1 -AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** -AP[2].SECURITY: WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infra -AP[3].CHAN: 1 -AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * -AP[3].SECURITY: WPA1 WPA2 -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-034.expected b/clients/tests/test-client.check-on-disk/test_004-034.expected index e33738241a..fbb3bfa1ce 100644 --- a/clients/tests/test-client.check-on-disk/test_004-034.expected +++ b/clients/tests/test-client.check-on-disk/test_004-034.expected @@ -1,71 +1,16 @@ -location: clients/tests/test-client.py:872:test_004()/34 -cmd: $NMCLI -f all dev show wlan0 +location: clients/tests/test-client.py:871:test_004()/34 +cmd: $NMCLI dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2991 bytes +stdout: 390 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi -GENERAL.NM-TYPE: NMDeviceWifi -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- GENERAL.HWADDR: 5A:88:5E:B6:90:40 GENERAL.MTU: 0 GENERAL.STATE: 20 (niedostępne) -GENERAL.REASON: 0 (Nie podano przyczyny) -GENERAL.UDI: /sys/devices/virtual/wlan0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nie -GENERAL.NM-MANAGED: tak -GENERAL.AUTOCONNECT: tak -GENERAL.FIRMWARE-MISSING: nie -GENERAL.NM-PLUGIN-MISSING: nie -GENERAL.PHYS-PORT-ID: -- GENERAL.CONNECTION: con-vpn-1 -GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.METERED: nieznane -CAPABILITIES.CARRIER-DETECT: nie -CAPABILITIES.SPEED: nieznane -CAPABILITIES.IS-SOFTWARE: nie -CAPABILITIES.SRIOV: nie -WIFI-PROPERTIES.WEP: tak -WIFI-PROPERTIES.WPA: tak -WIFI-PROPERTIES.WPA2: tak -WIFI-PROPERTIES.TKIP: tak -WIFI-PROPERTIES.CCMP: tak -WIFI-PROPERTIES.AP: tak -WIFI-PROPERTIES.ADHOC: tak -WIFI-PROPERTIES.2GHZ: nieznane -WIFI-PROPERTIES.5GHZ: nieznane -AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infrastruktura -AP[1].CHAN: 1 -AP[1].RATE: 54 Mb/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** -AP[1].SECURITY: WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infrastruktura -AP[2].CHAN: 1 -AP[2].RATE: 54 Mb/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** -AP[2].SECURITY: WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infrastruktura -AP[3].CHAN: 1 -AP[3].RATE: 54 Mb/s -AP[3].SIGNAL: 29 -AP[3].BARS: * -AP[3].SECURITY: WPA1 WPA2 -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected new file mode 100644 index 0000000000..8193673733 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-035.expected @@ -0,0 +1,74 @@ +location: clients/tests/test-client.py:874:test_004()/35 +cmd: $NMCLI -f all dev show wlan0 +lang: C +returncode: 0 +stdout: 2948 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 5A:88:5E:B6:90:40 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: unknown +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIFI-PROPERTIES.WEP: yes +WIFI-PROPERTIES.WPA: yes +WIFI-PROPERTIES.WPA2: yes +WIFI-PROPERTIES.TKIP: yes +WIFI-PROPERTIES.CCMP: yes +WIFI-PROPERTIES.AP: yes +WIFI-PROPERTIES.ADHOC: yes +WIFI-PROPERTIES.2GHZ: unknown +WIFI-PROPERTIES.5GHZ: unknown +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-3 +AP[1].MODE: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 88 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-2 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 61 +AP[2].BARS: *** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-1 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 29 +AP[3].BARS: * +AP[3].SECURITY: WPA1 WPA2 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected new file mode 100644 index 0000000000..e3be08716f --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-036.expected @@ -0,0 +1,74 @@ +location: clients/tests/test-client.py:874:test_004()/36 +cmd: $NMCLI -f all dev show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 2991 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 5A:88:5E:B6:90:40 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: nieznane +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIFI-PROPERTIES.WEP: tak +WIFI-PROPERTIES.WPA: tak +WIFI-PROPERTIES.WPA2: tak +WIFI-PROPERTIES.TKIP: tak +WIFI-PROPERTIES.CCMP: tak +WIFI-PROPERTIES.AP: tak +WIFI-PROPERTIES.ADHOC: tak +WIFI-PROPERTIES.2GHZ: nieznane +WIFI-PROPERTIES.5GHZ: nieznane +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-3 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 88 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-2 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 61 +AP[2].BARS: *** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-1 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 29 +AP[3].BARS: * +AP[3].SECURITY: WPA1 WPA2 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 51fd5d7cc5..1d5cc54f60 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -852,6 +852,8 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['con', 's', 'con-vpn-1'], replace_stdout = replace_stdout) + self.call_nmcli_l(['-t', 'con', 's', 'con-vpn-1'], + replace_stdout = replace_stdout) self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'con-vpn-1'], replace_stdout = replace_stdout) From 3255a97b3a86f7acc8a3ae5e24d7d4cf89cc57f5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 6 Jun 2018 14:59:37 +0200 Subject: [PATCH 2/8] tests: fix dry-run for _dbus_property_set() in test-networkmanager-service.py --- tools/test-networkmanager-service.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 1f623f6912..1eb82e8ad2 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -432,6 +432,8 @@ class ExportedObj(dbus.service.Object): if not permission_granted: raise TestError("Cannot set property '%s' on '%s' on '%s' via D-Bus" % (propname, dbus_iface, self.path)) + return + assert propname in props props[propname] = value From 2a53555faae75dad3905b4bf26ec1700bd663ac4 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 6 Jun 2018 15:02:13 +0200 Subject: [PATCH 3/8] tests: simulate available-connections in test-networkmanager-service.py --- .../test_003-030.expected | 7 ++- .../test_003-031.expected | 7 ++- .../test_003-051.expected | 7 ++- .../test_003-052.expected | 7 ++- .../test_004-035.expected | 5 +- .../test_004-036.expected | 5 +- tools/test-networkmanager-service.py | 46 ++++++++++++++++--- 7 files changed, 66 insertions(+), 18 deletions(-) diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index e1148ab714..b8fe3f23d7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:763:test_003()/30 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 1487 bytes +stdout: 1793 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -33,7 +33,10 @@ CAPABILITIES.SPEED: 100 Mb/s CAPABILITIES.IS-SOFTWARE: no CAPABILITIES.SRIOV: no WIRED-PROPERTIES.CARRIER: off -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index 8cd81f00a3..b6715a7d06 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:763:test_003()/31 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1510 bytes +stdout: 1816 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -33,7 +33,10 @@ CAPABILITIES.SPEED: 100 Mb/s CAPABILITIES.IS-SOFTWARE: nie CAPABILITIES.SRIOV: nie WIRED-PROPERTIES.CARRIER: wyłączone -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected index c5a4261cdb..e9b27f73bd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:763:test_003()/51 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 1487 bytes +stdout: 1793 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -33,7 +33,10 @@ CAPABILITIES.SPEED: 100 Mb/s CAPABILITIES.IS-SOFTWARE: no CAPABILITIES.SRIOV: no WIRED-PROPERTIES.CARRIER: off -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected index d64e3549fb..12c3c1040f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:763:test_003()/52 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1510 bytes +stdout: 1816 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -33,7 +33,10 @@ CAPABILITIES.SPEED: 100 Mb/s CAPABILITIES.IS-SOFTWARE: nie CAPABILITIES.SRIOV: nie WIRED-PROPERTIES.CARRIER: wyłączone -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected index 8193673733..cce30098c2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-035.expected +++ b/clients/tests/test-client.check-on-disk/test_004-035.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:874:test_004()/35 cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 -stdout: 2948 bytes +stdout: 3077 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -65,7 +65,8 @@ AP[3].RATE: 54 Mbit/s AP[3].SIGNAL: 29 AP[3].BARS: * AP[3].SECURITY: WPA1 WPA2 -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected index e3be08716f..875774a77f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-036.expected +++ b/clients/tests/test-client.check-on-disk/test_004-036.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:874:test_004()/36 cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2991 bytes +stdout: 3120 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -65,7 +65,8 @@ AP[3].RATE: 54 Mb/s AP[3].SIGNAL: 29 AP[3].BARS: * AP[3].SECURITY: WPA1 WPA2 -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< stderr: 0 bytes diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 1eb82e8ad2..0cbb5e452c 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -395,7 +395,7 @@ class ExportedObj(dbus.service.Object): return self._dbus_interface_get_property(self._dbus_interface_get(dbus_iface), propname) - def _dbus_property_set(self, dbus_iface, propname, value, allow_detect_dbus_iface = False, dry_run = False): + def _dbus_property_set(self, dbus_iface, propname, value, allow_detect_dbus_iface = False, dry_run = False, force_update = False): if allow_detect_dbus_iface and not dbus_iface: props = None for p, dbus_interface in self._dbus_ifaces.items(): @@ -436,6 +436,10 @@ class ExportedObj(dbus.service.Object): assert propname in props + if not force_update: + if props[propname] == value: + return + props[propname] = value self._dbus_property_notify(dbus_iface, propname) @@ -536,6 +540,24 @@ class Device(ExportedObj): def set_active_connection(self, ac): self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_ACTIVE_CONNECTION, ac) + def connection_is_available(self, con_inst): + if con_inst.is_vpn(): + return False + if isinstance(self, WiredDevice): + if con_inst.get_type() == NM.SETTING_WIRED_SETTING_NAME: + return True + elif isinstance(self, WifiDevice): + if con_inst.get_type() == NM.SETTING_WIRELESS_SETTING_NAME: + return True + return False + + def available_connections_get(self): + return [c for c in gl.settings.connections.values() if self.connection_is_available(c)] + + def available_connections_update(self): + self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_AVAILABLE_CONNECTIONS, + ExportedObj.to_path_array(self.available_connections_get())) + ############################################################################### PRP_WIRED_HW_ADDRESS = "HwAddress" @@ -873,13 +895,11 @@ class ActiveConnection(ExportedObj): def __init__(self, device, con_inst, specific_object): - is_vpn = (NmUtil.con_hash_get_type(con_inst.con_hash) == NM.SETTING_VPN_SETTING_NAME) - ExportedObj.__init__(self, ExportedObj.create_path(ActiveConnection)) self.device = device self.con_inst = con_inst - self.is_vpn = is_vpn + self.is_vpn = con_inst.is_vpn() self._activation_id = None @@ -899,13 +919,13 @@ class ActiveConnection(ExportedObj): PRP_ACTIVE_CONNECTION_DEFAULT6: False, PRP_ACTIVE_CONNECTION_IP6CONFIG: ExportedObj.to_path(None), PRP_ACTIVE_CONNECTION_DHCP6CONFIG: ExportedObj.to_path(None), - PRP_ACTIVE_CONNECTION_VPN: is_vpn, + PRP_ACTIVE_CONNECTION_VPN: self.is_vpn, PRP_ACTIVE_CONNECTION_MASTER: ExportedObj.to_path(None), } self.dbus_interface_add(IFACE_ACTIVE_CONNECTION, props, ActiveConnection.PropertiesChanged) - if is_vpn: + if self.is_vpn: props = { PRP_VPN_CONNECTION_VPN_STATE: dbus.UInt32(NM.VpnConnectionState.UNKNOWN), PRP_VPN_CONNECTION_BANNER: '*** VPN connection %s ***' % (con_inst.get_id()), @@ -1200,6 +1220,10 @@ class NetworkManager(ExportedObj): self.DeviceRemoved(ExportedObj.to_path(device)) device.unexport() + def devices_available_connections_update(self): + for d in self.devices: + d.available_connections_update() + @dbus.service.signal(IFACE_NM, signature='o') def DeviceRemoved(self, devpath): pass @@ -1350,6 +1374,12 @@ class Connection(ExportedObj): def get_uuid(self): return NmUtil.con_hash_get_uuid(self.con_hash) + def get_type(self): + return NmUtil.con_hash_get_type(self.con_hash) + + def is_vpn(self): + return self.get_type() == NM.SETTING_VPN_SETTING_NAME + def update_connection(self, con_hash, do_verify_strict): NmUtil.con_hash_verify(con_hash, do_verify_strict = do_verify_strict) @@ -1461,6 +1491,8 @@ class Settings(ExportedObj): self.remove_next_connection = False self.delete_connection(con_inst) + gl.manager.devices_available_connections_update() + return con_inst.path def update_connection(self, con_hash, path=None, do_verify_strict=True): @@ -1474,6 +1506,8 @@ class Settings(ExportedObj): con_inst.Removed() con_inst.unexport() + gl.manager.devices_available_connections_update() + @dbus.service.method(dbus_interface=IFACE_SETTINGS, in_signature='s', out_signature='') def SaveHostname(self, hostname): # Arbitrary requirement to test error handling From ac8f7869878b2ed8d2b882cb14b21fc7b6ef2ffa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 7 Jun 2018 10:27:10 +0200 Subject: [PATCH 4/8] clients/tests: add optional "required" argument to findConnectionUuid() It's still unused, but commit it individually, as it also causes trivial changes to the .expected files. --- clients/tests/test-client.check-on-disk/test_001-001.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-002.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-003.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-004.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-005.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-006.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-007.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-008.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-009.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-010.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-011.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-012.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-013.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-014.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-015.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-016.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-017.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-018.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-019.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-020.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-021.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-022.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-023.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-024.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-025.expected | 2 +- clients/tests/test-client.check-on-disk/test_001-026.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-001.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-002.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-003.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-004.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-005.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-006.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-007.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-008.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-009.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-010.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-011.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-012.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-013.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-014.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-015.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-016.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-017.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-018.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-019.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-020.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-021.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-022.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-023.expected | 2 +- clients/tests/test-client.check-on-disk/test_002-024.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-001.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-002.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-003.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-004.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-005.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-006.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-007.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-008.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-009.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-010.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-011.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-012.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-013.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-014.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-015.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-016.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-017.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-018.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-019.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-020.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-021.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-022.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-023.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-024.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-025.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-026.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-027.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-028.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-029.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-030.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-031.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-032.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-033.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-034.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-035.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-036.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-037.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-038.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-039.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-040.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-041.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-042.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-043.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-044.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-045.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-046.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-047.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-048.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-049.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-050.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-051.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-052.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-053.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-054.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-055.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-056.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-057.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-058.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-059.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-060.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-061.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-062.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-063.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-064.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-065.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-066.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-067.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-068.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-069.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-070.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-071.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-072.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-073.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-074.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-075.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-076.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-077.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-078.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-079.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-080.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-081.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-082.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-083.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-084.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-085.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-086.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-087.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-088.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-089.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-090.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-091.expected | 2 +- clients/tests/test-client.check-on-disk/test_003-092.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-001.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-002.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-003.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-004.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-005.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-006.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-007.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-008.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-009.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-010.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-011.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-012.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-013.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-014.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-015.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-016.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-017.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-018.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-019.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-020.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-021.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-022.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-023.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-024.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-025.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-026.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-027.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-028.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-029.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-030.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-031.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-032.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-033.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-034.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-035.expected | 2 +- clients/tests/test-client.check-on-disk/test_004-036.expected | 2 +- clients/tests/test-client.py | 4 +++- 179 files changed, 181 insertions(+), 179 deletions(-) diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected index bbb7924983..5c89de6e1d 100644 --- a/clients/tests/test-client.check-on-disk/test_001-001.expected +++ b/clients/tests/test-client.check-on-disk/test_001-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:656:test_001()/1 +location: clients/tests/test-client.py:658:test_001()/1 cmd: $NMCLI lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-002.expected b/clients/tests/test-client.check-on-disk/test_001-002.expected index e56b1bedae..fecdafdfa7 100644 --- a/clients/tests/test-client.check-on-disk/test_001-002.expected +++ b/clients/tests/test-client.check-on-disk/test_001-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:656:test_001()/2 +location: clients/tests/test-client.py:658:test_001()/2 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-003.expected b/clients/tests/test-client.check-on-disk/test_001-003.expected index 97f26f0b4b..4b001b3290 100644 --- a/clients/tests/test-client.check-on-disk/test_001-003.expected +++ b/clients/tests/test-client.check-on-disk/test_001-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:658:test_001()/3 +location: clients/tests/test-client.py:660:test_001()/3 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-004.expected b/clients/tests/test-client.check-on-disk/test_001-004.expected index b016817806..4b80dc77d4 100644 --- a/clients/tests/test-client.check-on-disk/test_001-004.expected +++ b/clients/tests/test-client.check-on-disk/test_001-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:658:test_001()/4 +location: clients/tests/test-client.py:660:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected index 92efd49fe5..4827807c75 100644 --- a/clients/tests/test-client.check-on-disk/test_001-005.expected +++ b/clients/tests/test-client.check-on-disk/test_001-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:660:test_001()/5 +location: clients/tests/test-client.py:662:test_001()/5 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected index 1526601637..80752b5fe7 100644 --- a/clients/tests/test-client.check-on-disk/test_001-006.expected +++ b/clients/tests/test-client.check-on-disk/test_001-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:660:test_001()/6 +location: clients/tests/test-client.py:662:test_001()/6 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected index 46d69717dc..9696369843 100644 --- a/clients/tests/test-client.check-on-disk/test_001-007.expected +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:662:test_001()/7 +location: clients/tests/test-client.py:664:test_001()/7 cmd: $NMCLI bogus s lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected index f16ba4bcf7..3ff1b98c6a 100644 --- a/clients/tests/test-client.check-on-disk/test_001-008.expected +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:662:test_001()/8 +location: clients/tests/test-client.py:664:test_001()/8 cmd: $NMCLI bogus s lang: pl_PL.UTF-8 returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected index 66907233e6..3a656c20de 100644 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ b/clients/tests/test-client.check-on-disk/test_001-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/9 +location: clients/tests/test-client.py:672:test_001()/9 cmd: $NMCLI general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected index 251145efd0..39142cfb03 100644 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ b/clients/tests/test-client.check-on-disk/test_001-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/10 +location: clients/tests/test-client.py:672:test_001()/10 cmd: $NMCLI general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected index 661d33aead..8a1468b2ee 100644 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/11 +location: clients/tests/test-client.py:672:test_001()/11 cmd: $NMCLI --pretty general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected index e96a3b094b..be9e7db10c 100644 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/12 +location: clients/tests/test-client.py:672:test_001()/12 cmd: $NMCLI --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-013.expected b/clients/tests/test-client.check-on-disk/test_001-013.expected index 7a8aa05386..4817eb2e88 100644 --- a/clients/tests/test-client.check-on-disk/test_001-013.expected +++ b/clients/tests/test-client.check-on-disk/test_001-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/13 +location: clients/tests/test-client.py:672:test_001()/13 cmd: $NMCLI --terse general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-014.expected b/clients/tests/test-client.check-on-disk/test_001-014.expected index add3aecf42..022ae8ad85 100644 --- a/clients/tests/test-client.check-on-disk/test_001-014.expected +++ b/clients/tests/test-client.check-on-disk/test_001-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/14 +location: clients/tests/test-client.py:672:test_001()/14 cmd: $NMCLI --terse general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-015.expected b/clients/tests/test-client.check-on-disk/test_001-015.expected index 4d85dd2761..40ddf03610 100644 --- a/clients/tests/test-client.check-on-disk/test_001-015.expected +++ b/clients/tests/test-client.check-on-disk/test_001-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/15 +location: clients/tests/test-client.py:672:test_001()/15 cmd: $NMCLI --mode tabular general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-016.expected b/clients/tests/test-client.check-on-disk/test_001-016.expected index 7ccaac3b84..38e3beb7bb 100644 --- a/clients/tests/test-client.check-on-disk/test_001-016.expected +++ b/clients/tests/test-client.check-on-disk/test_001-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/16 +location: clients/tests/test-client.py:672:test_001()/16 cmd: $NMCLI --mode tabular general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-017.expected b/clients/tests/test-client.check-on-disk/test_001-017.expected index e15f6a1c29..c92293767b 100644 --- a/clients/tests/test-client.check-on-disk/test_001-017.expected +++ b/clients/tests/test-client.check-on-disk/test_001-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/17 +location: clients/tests/test-client.py:672:test_001()/17 cmd: $NMCLI --mode tabular --pretty general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-018.expected b/clients/tests/test-client.check-on-disk/test_001-018.expected index 42121bb292..afa0ad0ed1 100644 --- a/clients/tests/test-client.check-on-disk/test_001-018.expected +++ b/clients/tests/test-client.check-on-disk/test_001-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/18 +location: clients/tests/test-client.py:672:test_001()/18 cmd: $NMCLI --mode tabular --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-019.expected b/clients/tests/test-client.check-on-disk/test_001-019.expected index f5c4f5c6b8..b99ca75f63 100644 --- a/clients/tests/test-client.check-on-disk/test_001-019.expected +++ b/clients/tests/test-client.check-on-disk/test_001-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/19 +location: clients/tests/test-client.py:672:test_001()/19 cmd: $NMCLI --mode tabular --terse general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-020.expected b/clients/tests/test-client.check-on-disk/test_001-020.expected index f1545fc93b..efbc927809 100644 --- a/clients/tests/test-client.check-on-disk/test_001-020.expected +++ b/clients/tests/test-client.check-on-disk/test_001-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/20 +location: clients/tests/test-client.py:672:test_001()/20 cmd: $NMCLI --mode tabular --terse general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-021.expected b/clients/tests/test-client.check-on-disk/test_001-021.expected index d3a39a1249..5da3b3678e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-021.expected +++ b/clients/tests/test-client.check-on-disk/test_001-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/21 +location: clients/tests/test-client.py:672:test_001()/21 cmd: $NMCLI --mode multiline general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-022.expected b/clients/tests/test-client.check-on-disk/test_001-022.expected index 261827032f..eb7312365f 100644 --- a/clients/tests/test-client.check-on-disk/test_001-022.expected +++ b/clients/tests/test-client.check-on-disk/test_001-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/22 +location: clients/tests/test-client.py:672:test_001()/22 cmd: $NMCLI --mode multiline general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-023.expected b/clients/tests/test-client.check-on-disk/test_001-023.expected index 705b17a81a..c2099e4675 100644 --- a/clients/tests/test-client.check-on-disk/test_001-023.expected +++ b/clients/tests/test-client.check-on-disk/test_001-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/23 +location: clients/tests/test-client.py:672:test_001()/23 cmd: $NMCLI --mode multiline --pretty general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-024.expected b/clients/tests/test-client.check-on-disk/test_001-024.expected index 32d7ff553c..ca0f7f4af4 100644 --- a/clients/tests/test-client.check-on-disk/test_001-024.expected +++ b/clients/tests/test-client.check-on-disk/test_001-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/24 +location: clients/tests/test-client.py:672:test_001()/24 cmd: $NMCLI --mode multiline --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-025.expected b/clients/tests/test-client.check-on-disk/test_001-025.expected index 475e8f747f..951568bcae 100644 --- a/clients/tests/test-client.check-on-disk/test_001-025.expected +++ b/clients/tests/test-client.check-on-disk/test_001-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/25 +location: clients/tests/test-client.py:672:test_001()/25 cmd: $NMCLI --mode multiline --terse general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-026.expected b/clients/tests/test-client.check-on-disk/test_001-026.expected index f91d9cad42..9507a6d39c 100644 --- a/clients/tests/test-client.check-on-disk/test_001-026.expected +++ b/clients/tests/test-client.check-on-disk/test_001-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:670:test_001()/26 +location: clients/tests/test-client.py:672:test_001()/26 cmd: $NMCLI --mode multiline --terse general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-001.expected b/clients/tests/test-client.check-on-disk/test_002-001.expected index 30109cc93b..3cd1badce1 100644 --- a/clients/tests/test-client.check-on-disk/test_002-001.expected +++ b/clients/tests/test-client.check-on-disk/test_002-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:675:test_002()/1 +location: clients/tests/test-client.py:677:test_002()/1 cmd: $NMCLI d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-002.expected b/clients/tests/test-client.check-on-disk/test_002-002.expected index 0f8f57f89a..bda15c7a03 100644 --- a/clients/tests/test-client.check-on-disk/test_002-002.expected +++ b/clients/tests/test-client.check-on-disk/test_002-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:675:test_002()/2 +location: clients/tests/test-client.py:677:test_002()/2 cmd: $NMCLI d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected index b337f30d10..56a1e6b43d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-003.expected +++ b/clients/tests/test-client.check-on-disk/test_002-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:677:test_002()/3 +location: clients/tests/test-client.py:679:test_002()/3 cmd: $NMCLI -f all d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected index f1dd1f2893..83d7e8794b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-004.expected +++ b/clients/tests/test-client.check-on-disk/test_002-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:677:test_002()/4 +location: clients/tests/test-client.py:679:test_002()/4 cmd: $NMCLI -f all d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected index 725b3f894e..c837008147 100644 --- a/clients/tests/test-client.check-on-disk/test_002-005.expected +++ b/clients/tests/test-client.check-on-disk/test_002-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:679:test_002()/5 +location: clients/tests/test-client.py:681:test_002()/5 cmd: $NMCLI lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected index 54812bf262..df5b17d4e6 100644 --- a/clients/tests/test-client.check-on-disk/test_002-006.expected +++ b/clients/tests/test-client.check-on-disk/test_002-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:679:test_002()/6 +location: clients/tests/test-client.py:681:test_002()/6 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected index 2ec9c9ca15..6e71d66f11 100644 --- a/clients/tests/test-client.check-on-disk/test_002-007.expected +++ b/clients/tests/test-client.check-on-disk/test_002-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:681:test_002()/7 +location: clients/tests/test-client.py:683:test_002()/7 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected index 351838ea42..ea9c00d211 100644 --- a/clients/tests/test-client.check-on-disk/test_002-008.expected +++ b/clients/tests/test-client.check-on-disk/test_002-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:681:test_002()/8 +location: clients/tests/test-client.py:683:test_002()/8 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected index fbe276e48f..56e4d1852e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-009.expected +++ b/clients/tests/test-client.check-on-disk/test_002-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:682:test_002()/9 +location: clients/tests/test-client.py:684:test_002()/9 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected index 434dbd8119..9e0406fbbe 100644 --- a/clients/tests/test-client.check-on-disk/test_002-010.expected +++ b/clients/tests/test-client.check-on-disk/test_002-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:682:test_002()/10 +location: clients/tests/test-client.py:684:test_002()/10 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected index 64222456ee..58d59ef558 100644 --- a/clients/tests/test-client.check-on-disk/test_002-011.expected +++ b/clients/tests/test-client.check-on-disk/test_002-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:683:test_002()/11 +location: clients/tests/test-client.py:685:test_002()/11 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected index 47a45c20b1..384bf90d41 100644 --- a/clients/tests/test-client.check-on-disk/test_002-012.expected +++ b/clients/tests/test-client.check-on-disk/test_002-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:683:test_002()/12 +location: clients/tests/test-client.py:685:test_002()/12 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected index 95eb53129d..2b1918664e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-013.expected +++ b/clients/tests/test-client.check-on-disk/test_002-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:684:test_002()/13 +location: clients/tests/test-client.py:686:test_002()/13 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected index aa9146b935..d413833c7c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-014.expected +++ b/clients/tests/test-client.check-on-disk/test_002-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:684:test_002()/14 +location: clients/tests/test-client.py:686:test_002()/14 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected index 417571073f..550f5952b7 100644 --- a/clients/tests/test-client.check-on-disk/test_002-015.expected +++ b/clients/tests/test-client.check-on-disk/test_002-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:685:test_002()/15 +location: clients/tests/test-client.py:687:test_002()/15 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected index 0065d267e7..fd99cb341d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-016.expected +++ b/clients/tests/test-client.check-on-disk/test_002-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:685:test_002()/16 +location: clients/tests/test-client.py:687:test_002()/16 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected index e0b0b5108a..f88a667f75 100644 --- a/clients/tests/test-client.check-on-disk/test_002-017.expected +++ b/clients/tests/test-client.check-on-disk/test_002-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:686:test_002()/17 +location: clients/tests/test-client.py:688:test_002()/17 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected index e5ec8a57bd..7daed1325a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-018.expected +++ b/clients/tests/test-client.check-on-disk/test_002-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:686:test_002()/18 +location: clients/tests/test-client.py:688:test_002()/18 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected index 4e0e856cff..0fa220e7ce 100644 --- a/clients/tests/test-client.check-on-disk/test_002-019.expected +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:688:test_002()/19 +location: clients/tests/test-client.py:690:test_002()/19 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected index 96e4d77a38..64ce4b82ab 100644 --- a/clients/tests/test-client.check-on-disk/test_002-020.expected +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:688:test_002()/20 +location: clients/tests/test-client.py:690:test_002()/20 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected index abc9a98811..09a0dcb321 100644 --- a/clients/tests/test-client.check-on-disk/test_002-021.expected +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:690:test_002()/21 +location: clients/tests/test-client.py:692:test_002()/21 cmd: $NMCLI c lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected index e5c60ff8a8..0c88e2c081 100644 --- a/clients/tests/test-client.check-on-disk/test_002-022.expected +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:690:test_002()/22 +location: clients/tests/test-client.py:692:test_002()/22 cmd: $NMCLI c lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected index 3f450162ea..dc484886f7 100644 --- a/clients/tests/test-client.check-on-disk/test_002-023.expected +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:692:test_002()/23 +location: clients/tests/test-client.py:694:test_002()/23 cmd: $NMCLI c s con-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected index c77f504da2..eca850e844 100644 --- a/clients/tests/test-client.check-on-disk/test_002-024.expected +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:692:test_002()/24 +location: clients/tests/test-client.py:694:test_002()/24 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected index 75037afb1a..243a871a39 100644 --- a/clients/tests/test-client.check-on-disk/test_003-001.expected +++ b/clients/tests/test-client.check-on-disk/test_003-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:702:test_003()/1 +location: clients/tests/test-client.py:704:test_003()/1 cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-002.expected b/clients/tests/test-client.check-on-disk/test_003-002.expected index bcd9150139..27cf1332b9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-002.expected +++ b/clients/tests/test-client.check-on-disk/test_003-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:705:test_003()/2 +location: clients/tests/test-client.py:707:test_003()/2 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-003.expected b/clients/tests/test-client.check-on-disk/test_003-003.expected index b4fc84b464..7dfadc81c2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-003.expected +++ b/clients/tests/test-client.check-on-disk/test_003-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:705:test_003()/3 +location: clients/tests/test-client.py:707:test_003()/3 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected index 671141316c..665fdce1b5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-004.expected +++ b/clients/tests/test-client.check-on-disk/test_003-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:710:test_003()/4 +location: clients/tests/test-client.py:712:test_003()/4 cmd: $NMCLI c add type ethernet ifname '*' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected index 6c2f3c27fd..03cec03778 100644 --- a/clients/tests/test-client.check-on-disk/test_003-005.expected +++ b/clients/tests/test-client.check-on-disk/test_003-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:713:test_003()/5 +location: clients/tests/test-client.py:715:test_003()/5 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected index caacf3b766..9e4a419d1e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-006.expected +++ b/clients/tests/test-client.check-on-disk/test_003-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:713:test_003()/6 +location: clients/tests/test-client.py:715:test_003()/6 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected index e9a0ef0ed9..1ad289db30 100644 --- a/clients/tests/test-client.check-on-disk/test_003-007.expected +++ b/clients/tests/test-client.check-on-disk/test_003-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:716:test_003()/7 +location: clients/tests/test-client.py:718:test_003()/7 cmd: $NMCLI -f ALL c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected index ac32549ae0..625a2b2d57 100644 --- a/clients/tests/test-client.check-on-disk/test_003-008.expected +++ b/clients/tests/test-client.check-on-disk/test_003-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:716:test_003()/8 +location: clients/tests/test-client.py:718:test_003()/8 cmd: $NMCLI -f ALL c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected index 3b645a57f0..c60429c633 100644 --- a/clients/tests/test-client.check-on-disk/test_003-009.expected +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:720:test_003()/9 +location: clients/tests/test-client.py:722:test_003()/9 cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected index e9a0236fa8..09a416a819 100644 --- a/clients/tests/test-client.check-on-disk/test_003-010.expected +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:720:test_003()/10 +location: clients/tests/test-client.py:722:test_003()/10 cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected index 98a21153db..9caf71cf58 100644 --- a/clients/tests/test-client.check-on-disk/test_003-011.expected +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:733:test_003()/11 +location: clients/tests/test-client.py:735:test_003()/11 cmd: $NMCLI con up ethernet ifname eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected index 2ce37e4211..a9069b27f8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-012.expected +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:736:test_003()/12 +location: clients/tests/test-client.py:738:test_003()/12 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected index fda543c9aa..868dcb6b53 100644 --- a/clients/tests/test-client.check-on-disk/test_003-013.expected +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:736:test_003()/13 +location: clients/tests/test-client.py:738:test_003()/13 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected index ed171679e5..f6fcc73ff5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-014.expected +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:739:test_003()/14 +location: clients/tests/test-client.py:741:test_003()/14 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected index 0baaa030ba..68496c4324 100644 --- a/clients/tests/test-client.check-on-disk/test_003-015.expected +++ b/clients/tests/test-client.check-on-disk/test_003-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:739:test_003()/15 +location: clients/tests/test-client.py:741:test_003()/15 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected index 373b0ddbc4..a7eddb2128 100644 --- a/clients/tests/test-client.check-on-disk/test_003-016.expected +++ b/clients/tests/test-client.check-on-disk/test_003-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:742:test_003()/16 +location: clients/tests/test-client.py:744:test_003()/16 cmd: $NMCLI -f ALL con s -a lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected index d16ce44e7b..3d86a7a596 100644 --- a/clients/tests/test-client.check-on-disk/test_003-017.expected +++ b/clients/tests/test-client.check-on-disk/test_003-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:742:test_003()/17 +location: clients/tests/test-client.py:744:test_003()/17 cmd: $NMCLI -f ALL con s -a lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected index 6168ba8df6..b53d986074 100644 --- a/clients/tests/test-client.check-on-disk/test_003-018.expected +++ b/clients/tests/test-client.check-on-disk/test_003-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:745:test_003()/18 +location: clients/tests/test-client.py:747:test_003()/18 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected index d2c2e114fc..61df73a612 100644 --- a/clients/tests/test-client.check-on-disk/test_003-019.expected +++ b/clients/tests/test-client.check-on-disk/test_003-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:745:test_003()/19 +location: clients/tests/test-client.py:747:test_003()/19 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected index 7f20af9e2e..f9a0d33da7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-020.expected +++ b/clients/tests/test-client.check-on-disk/test_003-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:748:test_003()/20 +location: clients/tests/test-client.py:750:test_003()/20 cmd: $NMCLI -f UUID,NAME con s --active lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected index c312142450..5fa35e6309 100644 --- a/clients/tests/test-client.check-on-disk/test_003-021.expected +++ b/clients/tests/test-client.check-on-disk/test_003-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:748:test_003()/21 +location: clients/tests/test-client.py:750:test_003()/21 cmd: $NMCLI -f UUID,NAME con s --active lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected index b29a2ea543..0d4ed6d1e4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-022.expected +++ b/clients/tests/test-client.check-on-disk/test_003-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:751:test_003()/22 +location: clients/tests/test-client.py:753:test_003()/22 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected index 0c0b7e4e16..cc38634772 100644 --- a/clients/tests/test-client.check-on-disk/test_003-023.expected +++ b/clients/tests/test-client.check-on-disk/test_003-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:751:test_003()/23 +location: clients/tests/test-client.py:753:test_003()/23 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected index dc9d9ce4be..b82e1617c3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-024.expected +++ b/clients/tests/test-client.check-on-disk/test_003-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:754:test_003()/24 +location: clients/tests/test-client.py:756:test_003()/24 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected index 3522769124..112e322345 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:754:test_003()/25 +location: clients/tests/test-client.py:756:test_003()/25 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected index 6a9803af4b..35b1ffb63e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:757:test_003()/26 +location: clients/tests/test-client.py:759:test_003()/26 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected index c4650c059e..adb58deaf4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:757:test_003()/27 +location: clients/tests/test-client.py:759:test_003()/27 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected index 05e9ae0645..408447ba17 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:760:test_003()/28 +location: clients/tests/test-client.py:762:test_003()/28 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected index 03f4c6ecca..2ff28af68f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:760:test_003()/29 +location: clients/tests/test-client.py:762:test_003()/29 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index b8fe3f23d7..93a2513e3a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:763:test_003()/30 +location: clients/tests/test-client.py:765:test_003()/30 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index b6715a7d06..19ba2d1296 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:763:test_003()/31 +location: clients/tests/test-client.py:765:test_003()/31 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected index b4800800fd..9f57c723ed 100644 --- a/clients/tests/test-client.check-on-disk/test_003-032.expected +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:733:test_003()/32 +location: clients/tests/test-client.py:735:test_003()/32 cmd: $NMCLI con up ethernet ifname eth1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected index 01537c86a1..f4b98a0a16 100644 --- a/clients/tests/test-client.check-on-disk/test_003-033.expected +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:736:test_003()/33 +location: clients/tests/test-client.py:738:test_003()/33 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected index 67dcac74fa..febc026213 100644 --- a/clients/tests/test-client.check-on-disk/test_003-034.expected +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:736:test_003()/34 +location: clients/tests/test-client.py:738:test_003()/34 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected index 562895a71d..66ea339784 100644 --- a/clients/tests/test-client.check-on-disk/test_003-035.expected +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:739:test_003()/35 +location: clients/tests/test-client.py:741:test_003()/35 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected index ef3b63b5d2..417dfab9a4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-036.expected +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:739:test_003()/36 +location: clients/tests/test-client.py:741:test_003()/36 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected index be97595609..70edda94b6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-037.expected +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:742:test_003()/37 +location: clients/tests/test-client.py:744:test_003()/37 cmd: $NMCLI -f ALL con s -a lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected index d38db63ff1..3ae757a601 100644 --- a/clients/tests/test-client.check-on-disk/test_003-038.expected +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:742:test_003()/38 +location: clients/tests/test-client.py:744:test_003()/38 cmd: $NMCLI -f ALL con s -a lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected index 1b7022805c..f334165d3a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-039.expected +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:745:test_003()/39 +location: clients/tests/test-client.py:747:test_003()/39 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected index 9d0d4cfb57..1851b0bc52 100644 --- a/clients/tests/test-client.check-on-disk/test_003-040.expected +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:745:test_003()/40 +location: clients/tests/test-client.py:747:test_003()/40 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected index b243ed266e..2461c1e418 100644 --- a/clients/tests/test-client.check-on-disk/test_003-041.expected +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:748:test_003()/41 +location: clients/tests/test-client.py:750:test_003()/41 cmd: $NMCLI -f UUID,NAME con s --active lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected index 2c5b556d28..88f1565683 100644 --- a/clients/tests/test-client.check-on-disk/test_003-042.expected +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:748:test_003()/42 +location: clients/tests/test-client.py:750:test_003()/42 cmd: $NMCLI -f UUID,NAME con s --active lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected index ed2e00d73e..d467a333d7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-043.expected +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:751:test_003()/43 +location: clients/tests/test-client.py:753:test_003()/43 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected index 97a1a3d470..94a7e194c8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-044.expected +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:751:test_003()/44 +location: clients/tests/test-client.py:753:test_003()/44 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected index 0214c70f9d..48891dd0d6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-045.expected +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:754:test_003()/45 +location: clients/tests/test-client.py:756:test_003()/45 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected index 3657a8c13a..75929579df 100644 --- a/clients/tests/test-client.check-on-disk/test_003-046.expected +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:754:test_003()/46 +location: clients/tests/test-client.py:756:test_003()/46 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected index bc4f457889..4a422037ee 100644 --- a/clients/tests/test-client.check-on-disk/test_003-047.expected +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:757:test_003()/47 +location: clients/tests/test-client.py:759:test_003()/47 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected index 9742869cb8..3ffb0bcb68 100644 --- a/clients/tests/test-client.check-on-disk/test_003-048.expected +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:757:test_003()/48 +location: clients/tests/test-client.py:759:test_003()/48 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected index 4b058efef5..934b11d172 100644 --- a/clients/tests/test-client.check-on-disk/test_003-049.expected +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:760:test_003()/49 +location: clients/tests/test-client.py:762:test_003()/49 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected index 0a09f1acdf..b59eb71659 100644 --- a/clients/tests/test-client.check-on-disk/test_003-050.expected +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:760:test_003()/50 +location: clients/tests/test-client.py:762:test_003()/50 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected index e9b27f73bd..4808d8d534 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:763:test_003()/51 +location: clients/tests/test-client.py:765:test_003()/51 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected index 12c3c1040f..4333c66ced 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:763:test_003()/52 +location: clients/tests/test-client.py:765:test_003()/52 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected index 7f969268cb..0c7367e002 100644 --- a/clients/tests/test-client.check-on-disk/test_003-053.expected +++ b/clients/tests/test-client.check-on-disk/test_003-053.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:777:test_003()/53 +location: clients/tests/test-client.py:779:test_003()/53 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected index a48840e0d0..71df3141af 100644 --- a/clients/tests/test-client.check-on-disk/test_003-054.expected +++ b/clients/tests/test-client.check-on-disk/test_003-054.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:777:test_003()/54 +location: clients/tests/test-client.py:779:test_003()/54 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected index f89b31ef39..abce51a659 100644 --- a/clients/tests/test-client.check-on-disk/test_003-055.expected +++ b/clients/tests/test-client.check-on-disk/test_003-055.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:780:test_003()/55 +location: clients/tests/test-client.py:782:test_003()/55 cmd: $NMCLI -f UUID,TYPE con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected index b69e2866be..445885c0bd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-056.expected +++ b/clients/tests/test-client.check-on-disk/test_003-056.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:780:test_003()/56 +location: clients/tests/test-client.py:782:test_003()/56 cmd: $NMCLI -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-057.expected b/clients/tests/test-client.check-on-disk/test_003-057.expected index f33d89fd8a..4e7e5d30ff 100644 --- a/clients/tests/test-client.check-on-disk/test_003-057.expected +++ b/clients/tests/test-client.check-on-disk/test_003-057.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:783:test_003()/57 +location: clients/tests/test-client.py:785:test_003()/57 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-058.expected b/clients/tests/test-client.check-on-disk/test_003-058.expected index 0503fbecc0..d491a07636 100644 --- a/clients/tests/test-client.check-on-disk/test_003-058.expected +++ b/clients/tests/test-client.check-on-disk/test_003-058.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:783:test_003()/58 +location: clients/tests/test-client.py:785:test_003()/58 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-059.expected b/clients/tests/test-client.check-on-disk/test_003-059.expected index b34c674a1c..47872594e9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-059.expected +++ b/clients/tests/test-client.check-on-disk/test_003-059.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:786:test_003()/59 +location: clients/tests/test-client.py:788:test_003()/59 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-060.expected b/clients/tests/test-client.check-on-disk/test_003-060.expected index f0b964c2f1..81e8d9cd90 100644 --- a/clients/tests/test-client.check-on-disk/test_003-060.expected +++ b/clients/tests/test-client.check-on-disk/test_003-060.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:786:test_003()/60 +location: clients/tests/test-client.py:788:test_003()/60 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-061.expected b/clients/tests/test-client.check-on-disk/test_003-061.expected index 78bfe96984..53c4fdbb1c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-061.expected +++ b/clients/tests/test-client.check-on-disk/test_003-061.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:789:test_003()/61 +location: clients/tests/test-client.py:791:test_003()/61 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected index b5effe1ffa..61020a0ca6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-062.expected +++ b/clients/tests/test-client.check-on-disk/test_003-062.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:789:test_003()/62 +location: clients/tests/test-client.py:791:test_003()/62 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected index c57defb03c..6251d8a210 100644 --- a/clients/tests/test-client.check-on-disk/test_003-063.expected +++ b/clients/tests/test-client.check-on-disk/test_003-063.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:792:test_003()/63 +location: clients/tests/test-client.py:794:test_003()/63 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected index 3df0263fad..1fbe313f33 100644 --- a/clients/tests/test-client.check-on-disk/test_003-064.expected +++ b/clients/tests/test-client.check-on-disk/test_003-064.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:792:test_003()/64 +location: clients/tests/test-client.py:794:test_003()/64 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected index d0a930703a..42cf1e41ca 100644 --- a/clients/tests/test-client.check-on-disk/test_003-065.expected +++ b/clients/tests/test-client.check-on-disk/test_003-065.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:795:test_003()/65 +location: clients/tests/test-client.py:797:test_003()/65 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected index 61d49b5fff..5ee5641c85 100644 --- a/clients/tests/test-client.check-on-disk/test_003-066.expected +++ b/clients/tests/test-client.check-on-disk/test_003-066.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:795:test_003()/66 +location: clients/tests/test-client.py:797:test_003()/66 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected index 50348a2f29..395db669a4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-067.expected +++ b/clients/tests/test-client.check-on-disk/test_003-067.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:798:test_003()/67 +location: clients/tests/test-client.py:800:test_003()/67 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected index 7d6e57846d..9c118600b8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-068.expected +++ b/clients/tests/test-client.check-on-disk/test_003-068.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:798:test_003()/68 +location: clients/tests/test-client.py:800:test_003()/68 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected index 81d1edaa2f..1c66969c63 100644 --- a/clients/tests/test-client.check-on-disk/test_003-069.expected +++ b/clients/tests/test-client.check-on-disk/test_003-069.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:801:test_003()/69 +location: clients/tests/test-client.py:803:test_003()/69 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected index 50cf870741..984d9d4fa0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-070.expected +++ b/clients/tests/test-client.check-on-disk/test_003-070.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:801:test_003()/70 +location: clients/tests/test-client.py:803:test_003()/70 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected index 14a0b2a06b..41e45a8aa1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-071.expected +++ b/clients/tests/test-client.check-on-disk/test_003-071.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:804:test_003()/71 +location: clients/tests/test-client.py:806:test_003()/71 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected index d7912b81b8..584effd8fd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-072.expected +++ b/clients/tests/test-client.check-on-disk/test_003-072.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:804:test_003()/72 +location: clients/tests/test-client.py:806:test_003()/72 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected index 382f7a8a92..f075f44b52 100644 --- a/clients/tests/test-client.check-on-disk/test_003-073.expected +++ b/clients/tests/test-client.check-on-disk/test_003-073.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:777:test_003()/73 +location: clients/tests/test-client.py:779:test_003()/73 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-074.expected b/clients/tests/test-client.check-on-disk/test_003-074.expected index 45a68481ae..ee9c4800f6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-074.expected +++ b/clients/tests/test-client.check-on-disk/test_003-074.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:777:test_003()/74 +location: clients/tests/test-client.py:779:test_003()/74 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected index 6a2954e699..098b1e708d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-075.expected +++ b/clients/tests/test-client.check-on-disk/test_003-075.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:780:test_003()/75 +location: clients/tests/test-client.py:782:test_003()/75 cmd: $NMCLI -f UUID,TYPE con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected index 5c815eb23f..4604e7b28d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-076.expected +++ b/clients/tests/test-client.check-on-disk/test_003-076.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:780:test_003()/76 +location: clients/tests/test-client.py:782:test_003()/76 cmd: $NMCLI -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected index 1b9754e20d..a47242310a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-077.expected +++ b/clients/tests/test-client.check-on-disk/test_003-077.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:783:test_003()/77 +location: clients/tests/test-client.py:785:test_003()/77 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected index ce69e4957d..83a0371b24 100644 --- a/clients/tests/test-client.check-on-disk/test_003-078.expected +++ b/clients/tests/test-client.check-on-disk/test_003-078.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:783:test_003()/78 +location: clients/tests/test-client.py:785:test_003()/78 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected index 8846f66365..22fd0414e4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-079.expected +++ b/clients/tests/test-client.check-on-disk/test_003-079.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:786:test_003()/79 +location: clients/tests/test-client.py:788:test_003()/79 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-080.expected b/clients/tests/test-client.check-on-disk/test_003-080.expected index 9da0e80a8c..fb45478d79 100644 --- a/clients/tests/test-client.check-on-disk/test_003-080.expected +++ b/clients/tests/test-client.check-on-disk/test_003-080.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:786:test_003()/80 +location: clients/tests/test-client.py:788:test_003()/80 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-081.expected b/clients/tests/test-client.check-on-disk/test_003-081.expected index 30c29bc615..8c06c49059 100644 --- a/clients/tests/test-client.check-on-disk/test_003-081.expected +++ b/clients/tests/test-client.check-on-disk/test_003-081.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:789:test_003()/81 +location: clients/tests/test-client.py:791:test_003()/81 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-082.expected b/clients/tests/test-client.check-on-disk/test_003-082.expected index 0eceb77657..936aadfa58 100644 --- a/clients/tests/test-client.check-on-disk/test_003-082.expected +++ b/clients/tests/test-client.check-on-disk/test_003-082.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:789:test_003()/82 +location: clients/tests/test-client.py:791:test_003()/82 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-083.expected b/clients/tests/test-client.check-on-disk/test_003-083.expected index d7b866182c..3a8381bb65 100644 --- a/clients/tests/test-client.check-on-disk/test_003-083.expected +++ b/clients/tests/test-client.check-on-disk/test_003-083.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:792:test_003()/83 +location: clients/tests/test-client.py:794:test_003()/83 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-084.expected b/clients/tests/test-client.check-on-disk/test_003-084.expected index 3d8c9c2aad..7f20b7ebf4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-084.expected +++ b/clients/tests/test-client.check-on-disk/test_003-084.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:792:test_003()/84 +location: clients/tests/test-client.py:794:test_003()/84 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-085.expected b/clients/tests/test-client.check-on-disk/test_003-085.expected index 9b682124fd..d0532d5f26 100644 --- a/clients/tests/test-client.check-on-disk/test_003-085.expected +++ b/clients/tests/test-client.check-on-disk/test_003-085.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:795:test_003()/85 +location: clients/tests/test-client.py:797:test_003()/85 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-086.expected b/clients/tests/test-client.check-on-disk/test_003-086.expected index 183bdde823..e5aef27f89 100644 --- a/clients/tests/test-client.check-on-disk/test_003-086.expected +++ b/clients/tests/test-client.check-on-disk/test_003-086.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:795:test_003()/86 +location: clients/tests/test-client.py:797:test_003()/86 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-087.expected b/clients/tests/test-client.check-on-disk/test_003-087.expected index f9b1a65962..7a3e5173f0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-087.expected +++ b/clients/tests/test-client.check-on-disk/test_003-087.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:798:test_003()/87 +location: clients/tests/test-client.py:800:test_003()/87 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-088.expected b/clients/tests/test-client.check-on-disk/test_003-088.expected index 01675fd1f6..d4498c8e0a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-088.expected +++ b/clients/tests/test-client.check-on-disk/test_003-088.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:798:test_003()/88 +location: clients/tests/test-client.py:800:test_003()/88 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-089.expected b/clients/tests/test-client.check-on-disk/test_003-089.expected index 31b3ddda05..b446745180 100644 --- a/clients/tests/test-client.check-on-disk/test_003-089.expected +++ b/clients/tests/test-client.check-on-disk/test_003-089.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:801:test_003()/89 +location: clients/tests/test-client.py:803:test_003()/89 cmd: $NMCLI con s ethernet lang: C returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_003-090.expected b/clients/tests/test-client.check-on-disk/test_003-090.expected index 2a830f4fee..b6f9b4dfda 100644 --- a/clients/tests/test-client.check-on-disk/test_003-090.expected +++ b/clients/tests/test-client.check-on-disk/test_003-090.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:801:test_003()/90 +location: clients/tests/test-client.py:803:test_003()/90 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_003-091.expected b/clients/tests/test-client.check-on-disk/test_003-091.expected index 8ab9564016..701b63b92a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-091.expected +++ b/clients/tests/test-client.check-on-disk/test_003-091.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:804:test_003()/91 +location: clients/tests/test-client.py:806:test_003()/91 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-092.expected b/clients/tests/test-client.check-on-disk/test_003-092.expected index 8d5c1a62d4..c1ab0b123e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-092.expected +++ b/clients/tests/test-client.check-on-disk/test_003-092.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:804:test_003()/92 +location: clients/tests/test-client.py:806:test_003()/92 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-001.expected b/clients/tests/test-client.check-on-disk/test_004-001.expected index 73a81206b4..fbb979541b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-001.expected +++ b/clients/tests/test-client.check-on-disk/test_004-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:814:test_004()/1 +location: clients/tests/test-client.py:816:test_004()/1 cmd: $NMCLI c add type wifi ifname '*' ssid foobar con-name con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-002.expected b/clients/tests/test-client.check-on-disk/test_004-002.expected index 77c0908c85..d81eba70b3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-002.expected +++ b/clients/tests/test-client.check-on-disk/test_004-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:816:test_004()/2 +location: clients/tests/test-client.py:818:test_004()/2 cmd: $NMCLI connection mod con-xx1 ip.gateway '' lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_004-003.expected b/clients/tests/test-client.check-on-disk/test_004-003.expected index c286684f55..738f2c73ec 100644 --- a/clients/tests/test-client.check-on-disk/test_004-003.expected +++ b/clients/tests/test-client.check-on-disk/test_004-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:817:test_004()/3 +location: clients/tests/test-client.py:819:test_004()/3 cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1 lang: pl_PL.UTF-8 returncode: 1 diff --git a/clients/tests/test-client.check-on-disk/test_004-004.expected b/clients/tests/test-client.check-on-disk/test_004-004.expected index e1df70c378..84231a0c19 100644 --- a/clients/tests/test-client.check-on-disk/test_004-004.expected +++ b/clients/tests/test-client.check-on-disk/test_004-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:818:test_004()/4 +location: clients/tests/test-client.py:820:test_004()/4 cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99 lang: C returncode: 1 diff --git a/clients/tests/test-client.check-on-disk/test_004-005.expected b/clients/tests/test-client.check-on-disk/test_004-005.expected index 3c1c2a5d04..78d852cc8b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-005.expected +++ b/clients/tests/test-client.check-on-disk/test_004-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:819:test_004()/5 +location: clients/tests/test-client.py:821:test_004()/5 cmd: $NMCLI connection mod con-xx1 802.abc '' lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_004-006.expected b/clients/tests/test-client.check-on-disk/test_004-006.expected index 0fcd984612..8d1d5eb9a4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-006.expected +++ b/clients/tests/test-client.check-on-disk/test_004-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:820:test_004()/6 +location: clients/tests/test-client.py:822:test_004()/6 cmd: $NMCLI connection mod con-xx1 802-11-wireless.band a lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-007.expected b/clients/tests/test-client.check-on-disk/test_004-007.expected index 8f628cde4d..791be0c92c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-007.expected +++ b/clients/tests/test-client.check-on-disk/test_004-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:821:test_004()/7 +location: clients/tests/test-client.py:823:test_004()/7 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-008.expected b/clients/tests/test-client.check-on-disk/test_004-008.expected index 51ce2a39e8..5ebbb1a792 100644 --- a/clients/tests/test-client.check-on-disk/test_004-008.expected +++ b/clients/tests/test-client.check-on-disk/test_004-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:823:test_004()/8 +location: clients/tests/test-client.py:825:test_004()/8 cmd: $NMCLI con s con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-009.expected b/clients/tests/test-client.check-on-disk/test_004-009.expected index c5155cf832..164ba4d92c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-009.expected +++ b/clients/tests/test-client.check-on-disk/test_004-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:823:test_004()/9 +location: clients/tests/test-client.py:825:test_004()/9 cmd: $NMCLI con s con-xx1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-010.expected b/clients/tests/test-client.check-on-disk/test_004-010.expected index 9d5f359b28..be6281d36e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-010.expected +++ b/clients/tests/test-client.check-on-disk/test_004-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:830:test_004()/10 +location: clients/tests/test-client.py:832:test_004()/10 cmd: $NMCLI connection add type vpn con-name con-vpn-1 ifname '*' vpn-type openvpn vpn.data 'key1 = val1, key2 = val2, key3=val3' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-011.expected b/clients/tests/test-client.check-on-disk/test_004-011.expected index 1171481561..975db506a1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-011.expected +++ b/clients/tests/test-client.check-on-disk/test_004-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:833:test_004()/11 +location: clients/tests/test-client.py:835:test_004()/11 cmd: $NMCLI con s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-012.expected b/clients/tests/test-client.check-on-disk/test_004-012.expected index 260a6b1a89..f5280f9554 100644 --- a/clients/tests/test-client.check-on-disk/test_004-012.expected +++ b/clients/tests/test-client.check-on-disk/test_004-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:833:test_004()/12 +location: clients/tests/test-client.py:835:test_004()/12 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-013.expected b/clients/tests/test-client.check-on-disk/test_004-013.expected index 74164e5544..e9244afa57 100644 --- a/clients/tests/test-client.check-on-disk/test_004-013.expected +++ b/clients/tests/test-client.check-on-disk/test_004-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:835:test_004()/13 +location: clients/tests/test-client.py:837:test_004()/13 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-014.expected b/clients/tests/test-client.check-on-disk/test_004-014.expected index ede05f47ad..958ffb6f6d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-014.expected +++ b/clients/tests/test-client.check-on-disk/test_004-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:835:test_004()/14 +location: clients/tests/test-client.py:837:test_004()/14 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-015.expected b/clients/tests/test-client.check-on-disk/test_004-015.expected index fef0327908..0284276118 100644 --- a/clients/tests/test-client.check-on-disk/test_004-015.expected +++ b/clients/tests/test-client.check-on-disk/test_004-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:837:test_004()/15 +location: clients/tests/test-client.py:839:test_004()/15 cmd: $NMCLI con up con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-016.expected b/clients/tests/test-client.check-on-disk/test_004-016.expected index b9833e5d64..a7cf6e962e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-016.expected +++ b/clients/tests/test-client.check-on-disk/test_004-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:839:test_004()/16 +location: clients/tests/test-client.py:841:test_004()/16 cmd: $NMCLI con s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-017.expected b/clients/tests/test-client.check-on-disk/test_004-017.expected index a6fc1bb954..f1421e5948 100644 --- a/clients/tests/test-client.check-on-disk/test_004-017.expected +++ b/clients/tests/test-client.check-on-disk/test_004-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:839:test_004()/17 +location: clients/tests/test-client.py:841:test_004()/17 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-018.expected b/clients/tests/test-client.check-on-disk/test_004-018.expected index 4dcb7dc478..f3cd80a746 100644 --- a/clients/tests/test-client.check-on-disk/test_004-018.expected +++ b/clients/tests/test-client.check-on-disk/test_004-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:841:test_004()/18 +location: clients/tests/test-client.py:843:test_004()/18 cmd: $NMCLI con up con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-019.expected b/clients/tests/test-client.check-on-disk/test_004-019.expected index f83c64d5ff..0f3c3909fb 100644 --- a/clients/tests/test-client.check-on-disk/test_004-019.expected +++ b/clients/tests/test-client.check-on-disk/test_004-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:843:test_004()/19 +location: clients/tests/test-client.py:845:test_004()/19 cmd: $NMCLI con s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-020.expected b/clients/tests/test-client.check-on-disk/test_004-020.expected index 3c3b3bdf6d..35ab7b1dfa 100644 --- a/clients/tests/test-client.check-on-disk/test_004-020.expected +++ b/clients/tests/test-client.check-on-disk/test_004-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:843:test_004()/20 +location: clients/tests/test-client.py:845:test_004()/20 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 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 7f876ded47..6a1174f7b9 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 @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:845:test_004()/21 +location: clients/tests/test-client.py:847:test_004()/21 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 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 75582122f4..1e5fce1bf0 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 @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:845:test_004()/22 +location: clients/tests/test-client.py:847:test_004()/22 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-023.expected b/clients/tests/test-client.check-on-disk/test_004-023.expected index 4043e845b9..a3c7ab2e6d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-023.expected +++ b/clients/tests/test-client.check-on-disk/test_004-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:854:test_004()/23 +location: clients/tests/test-client.py:856:test_004()/23 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-024.expected b/clients/tests/test-client.check-on-disk/test_004-024.expected index 1f5d993662..d9a40e4c09 100644 --- a/clients/tests/test-client.check-on-disk/test_004-024.expected +++ b/clients/tests/test-client.check-on-disk/test_004-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:854:test_004()/24 +location: clients/tests/test-client.py:856:test_004()/24 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-025.expected b/clients/tests/test-client.check-on-disk/test_004-025.expected index ef42d6ce51..d7bf8f2e3e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-025.expected +++ b/clients/tests/test-client.check-on-disk/test_004-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:856:test_004()/25 +location: clients/tests/test-client.py:858:test_004()/25 cmd: $NMCLI -t con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected index c37f72b6ce..a56c7df87f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-026.expected +++ b/clients/tests/test-client.check-on-disk/test_004-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:856:test_004()/26 +location: clients/tests/test-client.py:858:test_004()/26 cmd: $NMCLI -t con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-027.expected b/clients/tests/test-client.check-on-disk/test_004-027.expected index 2e5852f17a..ca328e8fe2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-027.expected +++ b/clients/tests/test-client.check-on-disk/test_004-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:859:test_004()/27 +location: clients/tests/test-client.py:861:test_004()/27 cmd: $NMCLI -f ALL con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-028.expected b/clients/tests/test-client.check-on-disk/test_004-028.expected index afd7e27e67..a84be56cb5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-028.expected +++ b/clients/tests/test-client.check-on-disk/test_004-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:859:test_004()/28 +location: clients/tests/test-client.py:861:test_004()/28 cmd: $NMCLI -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-029.expected b/clients/tests/test-client.check-on-disk/test_004-029.expected index b1945db297..2cc160349f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-029.expected +++ b/clients/tests/test-client.check-on-disk/test_004-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:865:test_004()/29 +location: clients/tests/test-client.py:867:test_004()/29 cmd: $NMCLI -f VPN con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-030.expected b/clients/tests/test-client.check-on-disk/test_004-030.expected index 06ce34164c..31933fd534 100644 --- a/clients/tests/test-client.check-on-disk/test_004-030.expected +++ b/clients/tests/test-client.check-on-disk/test_004-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:865:test_004()/30 +location: clients/tests/test-client.py:867:test_004()/30 cmd: $NMCLI -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-031.expected b/clients/tests/test-client.check-on-disk/test_004-031.expected index 561a9d1c10..6d18ca3b6d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-031.expected +++ b/clients/tests/test-client.check-on-disk/test_004-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:868:test_004()/31 +location: clients/tests/test-client.py:870:test_004()/31 cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-032.expected b/clients/tests/test-client.check-on-disk/test_004-032.expected index fc68846326..da930659c0 100644 --- a/clients/tests/test-client.check-on-disk/test_004-032.expected +++ b/clients/tests/test-client.check-on-disk/test_004-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:868:test_004()/32 +location: clients/tests/test-client.py:870:test_004()/32 cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-033.expected b/clients/tests/test-client.check-on-disk/test_004-033.expected index 31ed829921..a777dcdc62 100644 --- a/clients/tests/test-client.check-on-disk/test_004-033.expected +++ b/clients/tests/test-client.check-on-disk/test_004-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:871:test_004()/33 +location: clients/tests/test-client.py:873:test_004()/33 cmd: $NMCLI dev show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-034.expected b/clients/tests/test-client.check-on-disk/test_004-034.expected index fbb3bfa1ce..b09be6fae0 100644 --- a/clients/tests/test-client.check-on-disk/test_004-034.expected +++ b/clients/tests/test-client.check-on-disk/test_004-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:871:test_004()/34 +location: clients/tests/test-client.py:873:test_004()/34 cmd: $NMCLI dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected index cce30098c2..9aed5fd6ff 100644 --- a/clients/tests/test-client.check-on-disk/test_004-035.expected +++ b/clients/tests/test-client.check-on-disk/test_004-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:874:test_004()/35 +location: clients/tests/test-client.py:876:test_004()/35 cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected index 875774a77f..9b2e7c7331 100644 --- a/clients/tests/test-client.check-on-disk/test_004-036.expected +++ b/clients/tests/test-client.check-on-disk/test_004-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:874:test_004()/36 +location: clients/tests/test-client.py:876:test_004()/36 cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 1d5cc54f60..63ad790a99 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -288,11 +288,13 @@ class NMStubServer: def addConnection(self, connection, do_verify_strict = True): return self.op_AddConnection(connection, do_verify_strict) - def findConnectionUuid(self, con_id): + def findConnectionUuid(self, con_id, required = True): try: u = Util.iter_single(self.op_FindConnections(con_id = con_id))[1] assert u, ("Invalid uuid %s" % (u)) except Exception as e: + if not required: + return None raise AssertionError("Unexpectedly not found connection %s: %s" % (con_id, str(e))) return u From dd2da759de7d0b80d2328ba9687f3a5a263723c0 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 7 Jun 2018 17:42:31 +0200 Subject: [PATCH 5/8] clients/tests: seed generated numbers for test-networkmanager-service.py At several places, "test-networkmanager-service.py" uses generated numbers with a defined seed. For example, generated connection's UUID is generated in a predictable, but randomized way (if you forgive the inprecise use of the word "random" in context of using a deterministic seed). Aside the connection's UUID, this becomes more interesting in the next commit where the stub server generates a list of IP and DHCP settings in a predictable randomized way. For "clients/tests" we spawn the test service multiple times, but also create similar environments by calling init_001(). This is done for convenience, where out of lazyness all the tests share one setup. But it's still a good idea that these tests generate slightly different setups, wherever applicable. this increases the possible setups which get tested. For example, the number of static IPv4 addresses (the following commit) is interested to explicitly test for zero or a non-zero number of addresses. If all tests happen to use the same seed, the tests are expected to also generate the same number of addresses, and we miss an opportunity to hit interesting test cases. There is still no guarantee that all interesting cases are hit, the chances are just better. The approach of generating the setup randomly, does not preclude that the stub-server allows to explicitly configure the setup. However, due to the sheer number of combinations that might be interesting to test, it's much simpler to rely on some randomization and have the justifid hope we catch interesting cases. Also in terms of runtime of the test, the cli unit tests should complete within few seconds. Testing every combination would result in huge tests and long runtimes. Also, the patch refactors generating random numbers in "test-networkmanager-service.py". For example, it introduces Util.RandomSeed(), which can be used to generate a sequence of different random numbers. It works by having an internal state and a counter which is combined to chain the seed and generate different numbers on each call. --- .../test_001-001.expected | 2 +- .../test_001-002.expected | 2 +- .../test_001-003.expected | 2 +- .../test_001-004.expected | 2 +- .../test_001-005.expected | 2 +- .../test_001-006.expected | 2 +- .../test_001-007.expected | 2 +- .../test_001-008.expected | 2 +- .../test_001-009.expected | 2 +- .../test_001-010.expected | 2 +- .../test_001-011.expected | 2 +- .../test_001-012.expected | 2 +- .../test_001-013.expected | 2 +- .../test_001-014.expected | 2 +- .../test_001-015.expected | 2 +- .../test_001-016.expected | 2 +- .../test_001-017.expected | 2 +- .../test_001-018.expected | 2 +- .../test_001-019.expected | 2 +- .../test_001-020.expected | 2 +- .../test_001-021.expected | 2 +- .../test_001-022.expected | 2 +- .../test_001-023.expected | 2 +- .../test_001-024.expected | 2 +- .../test_001-025.expected | 2 +- .../test_001-026.expected | 2 +- .../test_002-001.expected | 2 +- .../test_002-002.expected | 2 +- .../test_002-003.expected | 2 +- .../test_002-004.expected | 2 +- .../test_002-005.expected | 12 +- .../test_002-006.expected | 12 +- .../test_002-007.expected | 18 +-- .../test_002-008.expected | 18 +-- .../test_002-009.expected | 18 +-- .../test_002-010.expected | 18 +-- .../test_002-011.expected | 18 +-- .../test_002-012.expected | 18 +-- .../test_002-013.expected | 8 +- .../test_002-014.expected | 8 +- .../test_002-015.expected | 8 +- .../test_002-016.expected | 8 +- .../test_002-017.expected | 8 +- .../test_002-018.expected | 8 +- .../test_002-019.expected | 10 +- .../test_002-020.expected | 10 +- .../test_002-021.expected | 2 +- .../test_002-022.expected | 2 +- .../test_002-023.expected | 2 +- .../test_002-024.expected | 2 +- .../test_003-001.expected | 2 +- .../test_003-002.expected | 2 +- .../test_003-003.expected | 2 +- .../test_003-004.expected | 2 +- .../test_003-005.expected | 2 +- .../test_003-006.expected | 2 +- .../test_003-007.expected | 2 +- .../test_003-008.expected | 2 +- .../test_003-009.expected | 2 +- .../test_003-010.expected | 2 +- .../test_003-011.expected | 2 +- .../test_003-012.expected | 2 +- .../test_003-013.expected | 2 +- .../test_003-014.expected | 2 +- .../test_003-015.expected | 2 +- .../test_003-016.expected | 2 +- .../test_003-017.expected | 2 +- .../test_003-018.expected | 2 +- .../test_003-019.expected | 2 +- .../test_003-020.expected | 2 +- .../test_003-021.expected | 2 +- .../test_003-022.expected | 2 +- .../test_003-023.expected | 2 +- .../test_003-024.expected | 2 +- .../test_003-025.expected | 2 +- .../test_003-026.expected | 2 +- .../test_003-027.expected | 2 +- .../test_003-028.expected | 2 +- .../test_003-029.expected | 2 +- .../test_003-030.expected | 4 +- .../test_003-031.expected | 4 +- .../test_003-032.expected | 2 +- .../test_003-033.expected | 2 +- .../test_003-034.expected | 2 +- .../test_003-035.expected | 2 +- .../test_003-036.expected | 2 +- .../test_003-037.expected | 2 +- .../test_003-038.expected | 2 +- .../test_003-039.expected | 2 +- .../test_003-040.expected | 2 +- .../test_003-041.expected | 2 +- .../test_003-042.expected | 2 +- .../test_003-043.expected | 2 +- .../test_003-044.expected | 2 +- .../test_003-045.expected | 2 +- .../test_003-046.expected | 2 +- .../test_003-047.expected | 2 +- .../test_003-048.expected | 2 +- .../test_003-049.expected | 2 +- .../test_003-050.expected | 2 +- .../test_003-051.expected | 4 +- .../test_003-052.expected | 4 +- .../test_003-053.expected | 2 +- .../test_003-054.expected | 2 +- .../test_003-055.expected | 2 +- .../test_003-056.expected | 2 +- .../test_003-057.expected | 2 +- .../test_003-058.expected | 2 +- .../test_003-059.expected | 2 +- .../test_003-060.expected | 2 +- .../test_003-061.expected | 2 +- .../test_003-062.expected | 2 +- .../test_003-063.expected | 2 +- .../test_003-064.expected | 2 +- .../test_003-065.expected | 2 +- .../test_003-066.expected | 2 +- .../test_003-067.expected | 2 +- .../test_003-068.expected | 2 +- .../test_003-069.expected | 2 +- .../test_003-070.expected | 2 +- .../test_003-071.expected | 2 +- .../test_003-072.expected | 2 +- .../test_003-073.expected | 2 +- .../test_003-074.expected | 2 +- .../test_003-075.expected | 2 +- .../test_003-076.expected | 2 +- .../test_003-077.expected | 2 +- .../test_003-078.expected | 2 +- .../test_003-079.expected | 2 +- .../test_003-080.expected | 2 +- .../test_003-081.expected | 2 +- .../test_003-082.expected | 2 +- .../test_003-083.expected | 2 +- .../test_003-084.expected | 2 +- .../test_003-085.expected | 2 +- .../test_003-086.expected | 2 +- .../test_003-087.expected | 2 +- .../test_003-088.expected | 2 +- .../test_003-089.expected | 2 +- .../test_003-090.expected | 2 +- .../test_003-091.expected | 2 +- .../test_003-092.expected | 2 +- .../test_004-001.expected | 2 +- .../test_004-002.expected | 2 +- .../test_004-003.expected | 2 +- .../test_004-004.expected | 2 +- .../test_004-005.expected | 2 +- .../test_004-006.expected | 2 +- .../test_004-007.expected | 2 +- .../test_004-008.expected | 2 +- .../test_004-009.expected | 2 +- .../test_004-010.expected | 2 +- .../test_004-011.expected | 2 +- .../test_004-012.expected | 2 +- .../test_004-013.expected | 2 +- .../test_004-014.expected | 2 +- .../test_004-015.expected | 2 +- .../test_004-016.expected | 2 +- .../test_004-017.expected | 2 +- .../test_004-018.expected | 2 +- .../test_004-019.expected | 2 +- .../test_004-020.expected | 2 +- .../test_004-021.expected | 2 +- .../test_004-022.expected | 2 +- .../test_004-023.expected | 2 +- .../test_004-024.expected | 2 +- .../test_004-025.expected | 2 +- .../test_004-026.expected | 2 +- .../test_004-027.expected | 2 +- .../test_004-028.expected | 2 +- .../test_004-029.expected | 2 +- .../test_004-030.expected | 2 +- .../test_004-031.expected | 2 +- .../test_004-032.expected | 2 +- .../test_004-033.expected | 4 +- .../test_004-034.expected | 4 +- .../test_004-035.expected | 20 ++-- .../test_004-036.expected | 20 ++-- clients/tests/test-client.py | 11 +- tools/test-networkmanager-service.py | 104 +++++++++++++++--- 180 files changed, 381 insertions(+), 306 deletions(-) diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected index 5c89de6e1d..acfda0c682 100644 --- a/clients/tests/test-client.check-on-disk/test_001-001.expected +++ b/clients/tests/test-client.check-on-disk/test_001-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:658:test_001()/1 +location: clients/tests/test-client.py:661:test_001()/1 cmd: $NMCLI lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-002.expected b/clients/tests/test-client.check-on-disk/test_001-002.expected index fecdafdfa7..317b13cfe2 100644 --- a/clients/tests/test-client.check-on-disk/test_001-002.expected +++ b/clients/tests/test-client.check-on-disk/test_001-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:658:test_001()/2 +location: clients/tests/test-client.py:661:test_001()/2 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-003.expected b/clients/tests/test-client.check-on-disk/test_001-003.expected index 4b001b3290..20d0437d24 100644 --- a/clients/tests/test-client.check-on-disk/test_001-003.expected +++ b/clients/tests/test-client.check-on-disk/test_001-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:660:test_001()/3 +location: clients/tests/test-client.py:663:test_001()/3 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-004.expected b/clients/tests/test-client.check-on-disk/test_001-004.expected index 4b80dc77d4..631170afae 100644 --- a/clients/tests/test-client.check-on-disk/test_001-004.expected +++ b/clients/tests/test-client.check-on-disk/test_001-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:660:test_001()/4 +location: clients/tests/test-client.py:663:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected index 4827807c75..2f522e7415 100644 --- a/clients/tests/test-client.check-on-disk/test_001-005.expected +++ b/clients/tests/test-client.check-on-disk/test_001-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:662:test_001()/5 +location: clients/tests/test-client.py:665:test_001()/5 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected index 80752b5fe7..3cdf18f502 100644 --- a/clients/tests/test-client.check-on-disk/test_001-006.expected +++ b/clients/tests/test-client.check-on-disk/test_001-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:662:test_001()/6 +location: clients/tests/test-client.py:665:test_001()/6 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected index 9696369843..387a099aac 100644 --- a/clients/tests/test-client.check-on-disk/test_001-007.expected +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:664:test_001()/7 +location: clients/tests/test-client.py:667:test_001()/7 cmd: $NMCLI bogus s lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected index 3ff1b98c6a..7b57f1b723 100644 --- a/clients/tests/test-client.check-on-disk/test_001-008.expected +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:664:test_001()/8 +location: clients/tests/test-client.py:667:test_001()/8 cmd: $NMCLI bogus s lang: pl_PL.UTF-8 returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected index 3a656c20de..492d01d2f3 100644 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ b/clients/tests/test-client.check-on-disk/test_001-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/9 +location: clients/tests/test-client.py:675:test_001()/9 cmd: $NMCLI general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected index 39142cfb03..af75890fdf 100644 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ b/clients/tests/test-client.check-on-disk/test_001-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/10 +location: clients/tests/test-client.py:675:test_001()/10 cmd: $NMCLI general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected index 8a1468b2ee..99c5e1bfc7 100644 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/11 +location: clients/tests/test-client.py:675:test_001()/11 cmd: $NMCLI --pretty general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected index be9e7db10c..86942fb338 100644 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/12 +location: clients/tests/test-client.py:675:test_001()/12 cmd: $NMCLI --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-013.expected b/clients/tests/test-client.check-on-disk/test_001-013.expected index 4817eb2e88..b23615d965 100644 --- a/clients/tests/test-client.check-on-disk/test_001-013.expected +++ b/clients/tests/test-client.check-on-disk/test_001-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/13 +location: clients/tests/test-client.py:675:test_001()/13 cmd: $NMCLI --terse general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-014.expected b/clients/tests/test-client.check-on-disk/test_001-014.expected index 022ae8ad85..fcd8dac2ae 100644 --- a/clients/tests/test-client.check-on-disk/test_001-014.expected +++ b/clients/tests/test-client.check-on-disk/test_001-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/14 +location: clients/tests/test-client.py:675:test_001()/14 cmd: $NMCLI --terse general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-015.expected b/clients/tests/test-client.check-on-disk/test_001-015.expected index 40ddf03610..0a701b0da6 100644 --- a/clients/tests/test-client.check-on-disk/test_001-015.expected +++ b/clients/tests/test-client.check-on-disk/test_001-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/15 +location: clients/tests/test-client.py:675:test_001()/15 cmd: $NMCLI --mode tabular general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-016.expected b/clients/tests/test-client.check-on-disk/test_001-016.expected index 38e3beb7bb..9fbae46c66 100644 --- a/clients/tests/test-client.check-on-disk/test_001-016.expected +++ b/clients/tests/test-client.check-on-disk/test_001-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/16 +location: clients/tests/test-client.py:675:test_001()/16 cmd: $NMCLI --mode tabular general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-017.expected b/clients/tests/test-client.check-on-disk/test_001-017.expected index c92293767b..557c9e3944 100644 --- a/clients/tests/test-client.check-on-disk/test_001-017.expected +++ b/clients/tests/test-client.check-on-disk/test_001-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/17 +location: clients/tests/test-client.py:675:test_001()/17 cmd: $NMCLI --mode tabular --pretty general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-018.expected b/clients/tests/test-client.check-on-disk/test_001-018.expected index afa0ad0ed1..48c10cd9a4 100644 --- a/clients/tests/test-client.check-on-disk/test_001-018.expected +++ b/clients/tests/test-client.check-on-disk/test_001-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/18 +location: clients/tests/test-client.py:675:test_001()/18 cmd: $NMCLI --mode tabular --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-019.expected b/clients/tests/test-client.check-on-disk/test_001-019.expected index b99ca75f63..0aed78fc0d 100644 --- a/clients/tests/test-client.check-on-disk/test_001-019.expected +++ b/clients/tests/test-client.check-on-disk/test_001-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/19 +location: clients/tests/test-client.py:675:test_001()/19 cmd: $NMCLI --mode tabular --terse general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-020.expected b/clients/tests/test-client.check-on-disk/test_001-020.expected index efbc927809..a30b490e70 100644 --- a/clients/tests/test-client.check-on-disk/test_001-020.expected +++ b/clients/tests/test-client.check-on-disk/test_001-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/20 +location: clients/tests/test-client.py:675:test_001()/20 cmd: $NMCLI --mode tabular --terse general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-021.expected b/clients/tests/test-client.check-on-disk/test_001-021.expected index 5da3b3678e..86d7d6eaf0 100644 --- a/clients/tests/test-client.check-on-disk/test_001-021.expected +++ b/clients/tests/test-client.check-on-disk/test_001-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/21 +location: clients/tests/test-client.py:675:test_001()/21 cmd: $NMCLI --mode multiline general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-022.expected b/clients/tests/test-client.check-on-disk/test_001-022.expected index eb7312365f..fe92e93587 100644 --- a/clients/tests/test-client.check-on-disk/test_001-022.expected +++ b/clients/tests/test-client.check-on-disk/test_001-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/22 +location: clients/tests/test-client.py:675:test_001()/22 cmd: $NMCLI --mode multiline general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-023.expected b/clients/tests/test-client.check-on-disk/test_001-023.expected index c2099e4675..cc1c088610 100644 --- a/clients/tests/test-client.check-on-disk/test_001-023.expected +++ b/clients/tests/test-client.check-on-disk/test_001-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/23 +location: clients/tests/test-client.py:675:test_001()/23 cmd: $NMCLI --mode multiline --pretty general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-024.expected b/clients/tests/test-client.check-on-disk/test_001-024.expected index ca0f7f4af4..69aa1ebd74 100644 --- a/clients/tests/test-client.check-on-disk/test_001-024.expected +++ b/clients/tests/test-client.check-on-disk/test_001-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/24 +location: clients/tests/test-client.py:675:test_001()/24 cmd: $NMCLI --mode multiline --pretty general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-025.expected b/clients/tests/test-client.check-on-disk/test_001-025.expected index 951568bcae..b1cd32db14 100644 --- a/clients/tests/test-client.check-on-disk/test_001-025.expected +++ b/clients/tests/test-client.check-on-disk/test_001-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/25 +location: clients/tests/test-client.py:675:test_001()/25 cmd: $NMCLI --mode multiline --terse general permissions lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-026.expected b/clients/tests/test-client.check-on-disk/test_001-026.expected index 9507a6d39c..e21f08b23c 100644 --- a/clients/tests/test-client.check-on-disk/test_001-026.expected +++ b/clients/tests/test-client.check-on-disk/test_001-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:672:test_001()/26 +location: clients/tests/test-client.py:675:test_001()/26 cmd: $NMCLI --mode multiline --terse general permissions lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-001.expected b/clients/tests/test-client.check-on-disk/test_002-001.expected index 3cd1badce1..2b2ad5c54f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-001.expected +++ b/clients/tests/test-client.check-on-disk/test_002-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:677:test_002()/1 +location: clients/tests/test-client.py:680:test_002()/1 cmd: $NMCLI d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-002.expected b/clients/tests/test-client.check-on-disk/test_002-002.expected index bda15c7a03..5f2df9e0f8 100644 --- a/clients/tests/test-client.check-on-disk/test_002-002.expected +++ b/clients/tests/test-client.check-on-disk/test_002-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:677:test_002()/2 +location: clients/tests/test-client.py:680:test_002()/2 cmd: $NMCLI d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected index 56a1e6b43d..fb52362f5a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-003.expected +++ b/clients/tests/test-client.check-on-disk/test_002-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:679:test_002()/3 +location: clients/tests/test-client.py:682:test_002()/3 cmd: $NMCLI -f all d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected index 83d7e8794b..f154a17936 100644 --- a/clients/tests/test-client.check-on-disk/test_002-004.expected +++ b/clients/tests/test-client.check-on-disk/test_002-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:679:test_002()/4 +location: clients/tests/test-client.py:682:test_002()/4 cmd: $NMCLI -f all d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected index c837008147..28f5e9ef4c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-005.expected +++ b/clients/tests/test-client.check-on-disk/test_002-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:681:test_002()/5 +location: clients/tests/test-client.py:684:test_002()/5 cmd: $NMCLI lang: C returncode: 0 @@ -6,23 +6,23 @@ stdout: 621 bytes >>> eth0: unavailable "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, hw + ethernet (virtual), 65:2E:D3:9E:0A:0D, hw eth1: unavailable "eth1" - ethernet (virtual), 1F:E6:D1:E6:1D:53, hw + ethernet (virtual), 47:D5:6B:65:FD:6A, hw wlan0: unavailable "wlan0" - wifi (virtual), 5A:88:5E:B6:90:40, hw + wifi (virtual), 3D:99:1D:8B:74:4D, hw wlan1: unavailable "wlan1" - wifi (virtual), 7C:D4:69:31:67:0B, hw + wifi (virtual), 99:09:77:FD:FE:1D, hw wlan1: unavailable "wlan1" - wifi (virtual), 41:21:6B:F3:C9:4A, hw + wifi (virtual), 5D:30:4A:EC:3F:61, hw DNS configuration: servers: 1.2.3.4 5.6.7.8 diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected index df5b17d4e6..9359486803 100644 --- a/clients/tests/test-client.check-on-disk/test_002-006.expected +++ b/clients/tests/test-client.check-on-disk/test_002-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:681:test_002()/6 +location: clients/tests/test-client.py:684:test_002()/6 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 @@ -6,23 +6,23 @@ stdout: 684 bytes >>> eth0: niedostępne "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, sprzęt + ethernet (virtual), 65:2E:D3:9E:0A:0D, sprzęt eth1: niedostępne "eth1" - ethernet (virtual), 1F:E6:D1:E6:1D:53, sprzęt + ethernet (virtual), 47:D5:6B:65:FD:6A, sprzęt wlan0: niedostępne "wlan0" - wifi (virtual), 5A:88:5E:B6:90:40, sprzęt + wifi (virtual), 3D:99:1D:8B:74:4D, sprzęt wlan1: niedostępne "wlan1" - wifi (virtual), 7C:D4:69:31:67:0B, sprzęt + wifi (virtual), 99:09:77:FD:FE:1D, sprzęt wlan1: niedostępne "wlan1" - wifi (virtual), 41:21:6B:F3:C9:4A, sprzęt + wifi (virtual), 5D:30:4A:EC:3F:61, sprzęt DNS configuration: servers: 1.2.3.4 5.6.7.8 diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected index 6e71d66f11..a99c1cb9be 100644 --- a/clients/tests/test-client.check-on-disk/test_002-007.expected +++ b/clients/tests/test-client.check-on-disk/test_002-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:683:test_002()/7 +location: clients/tests/test-client.py:686:test_002()/7 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 @@ -9,24 +9,24 @@ AP[1].SSID: wlan0-ap-3 AP[1].MODE: Infra AP[1].CHAN: 1 AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** +AP[1].SIGNAL: 55 +AP[1].BARS: ** AP[1].SECURITY: WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infra AP[2].CHAN: 1 AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 44 +AP[2].BARS: ** AP[2].SECURITY: WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-2 AP[3].MODE: Infra AP[3].CHAN: 1 AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 34 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 <<< diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected index ea9c00d211..d59acb2c8e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-008.expected +++ b/clients/tests/test-client.check-on-disk/test_002-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:683:test_002()/8 +location: clients/tests/test-client.py:686:test_002()/8 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9,24 +9,24 @@ AP[1].SSID: wlan0-ap-3 AP[1].MODE: Infrastruktura AP[1].CHAN: 1 AP[1].RATE: 54 Mb/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** +AP[1].SIGNAL: 55 +AP[1].BARS: ** AP[1].SECURITY: WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infrastruktura AP[2].CHAN: 1 AP[2].RATE: 54 Mb/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 44 +AP[2].BARS: ** AP[2].SECURITY: WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-2 AP[3].MODE: Infrastruktura AP[3].CHAN: 1 AP[3].RATE: 54 Mb/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 34 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 <<< diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected index 56e4d1852e..4f3617213d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-009.expected +++ b/clients/tests/test-client.check-on-disk/test_002-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:684:test_002()/9 +location: clients/tests/test-client.py:687:test_002()/9 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 @@ -12,26 +12,26 @@ AP[1].SSID: wlan0-ap-3 AP[1].MODE: Infra AP[1].CHAN: 1 AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** +AP[1].SIGNAL: 55 +AP[1].BARS: ** AP[1].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infra AP[2].CHAN: 1 AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 44 +AP[2].BARS: ** AP[2].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-2 AP[3].MODE: Infra AP[3].CHAN: 1 AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 34 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected index 9e0406fbbe..7c0a837b98 100644 --- a/clients/tests/test-client.check-on-disk/test_002-010.expected +++ b/clients/tests/test-client.check-on-disk/test_002-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:684:test_002()/10 +location: clients/tests/test-client.py:687:test_002()/10 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -12,26 +12,26 @@ AP[1].SSID: wlan0-ap-3 AP[1].MODE: Infrastruktura AP[1].CHAN: 1 AP[1].RATE: 54 Mb/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** +AP[1].SIGNAL: 55 +AP[1].BARS: ** AP[1].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infrastruktura AP[2].CHAN: 1 AP[2].RATE: 54 Mb/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 44 +AP[2].BARS: ** AP[2].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-2 AP[3].MODE: Infrastruktura AP[3].CHAN: 1 AP[3].RATE: 54 Mb/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 34 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected index 58d59ef558..177c30b93b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-011.expected +++ b/clients/tests/test-client.check-on-disk/test_002-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:685:test_002()/11 +location: clients/tests/test-client.py:688:test_002()/11 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 @@ -9,24 +9,24 @@ AP[1].SSID:wlan0-ap-3 AP[1].MODE:Infra AP[1].CHAN:1 AP[1].RATE:54 Mbit/s -AP[1].SIGNAL:88 -AP[1].BARS:**** +AP[1].SIGNAL:55 +AP[1].BARS:** AP[1].SECURITY:WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID:wlan0-ap-2 +AP[2].SSID:wlan0-ap-1 AP[2].MODE:Infra AP[2].CHAN:1 AP[2].RATE:54 Mbit/s -AP[2].SIGNAL:61 -AP[2].BARS:*** +AP[2].SIGNAL:44 +AP[2].BARS:** AP[2].SECURITY:WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID:wlan0-ap-1 +AP[3].SSID:wlan0-ap-2 AP[3].MODE:Infra AP[3].CHAN:1 AP[3].RATE:54 Mbit/s -AP[3].SIGNAL:29 -AP[3].BARS:* +AP[3].SIGNAL:34 +AP[3].BARS:** AP[3].SECURITY:WPA1 WPA2 <<< diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected index 384bf90d41..33ad53f9b1 100644 --- a/clients/tests/test-client.check-on-disk/test_002-012.expected +++ b/clients/tests/test-client.check-on-disk/test_002-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:685:test_002()/12 +location: clients/tests/test-client.py:688:test_002()/12 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9,24 +9,24 @@ AP[1].SSID:wlan0-ap-3 AP[1].MODE:Infrastruktura AP[1].CHAN:1 AP[1].RATE:54 Mb/s -AP[1].SIGNAL:88 -AP[1].BARS:**** +AP[1].SIGNAL:55 +AP[1].BARS:** AP[1].SECURITY:WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID:wlan0-ap-2 +AP[2].SSID:wlan0-ap-1 AP[2].MODE:Infrastruktura AP[2].CHAN:1 AP[2].RATE:54 Mb/s -AP[2].SIGNAL:61 -AP[2].BARS:*** +AP[2].SIGNAL:44 +AP[2].BARS:** AP[2].SECURITY:WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID:wlan0-ap-1 +AP[3].SSID:wlan0-ap-2 AP[3].MODE:Infrastruktura AP[3].CHAN:1 AP[3].RATE:54 Mb/s -AP[3].SIGNAL:29 -AP[3].BARS:* +AP[3].SIGNAL:34 +AP[3].BARS:** AP[3].SECURITY:WPA1 WPA2 <<< diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected index 2b1918664e..afd214b3f8 100644 --- a/clients/tests/test-client.check-on-disk/test_002-013.expected +++ b/clients/tests/test-client.check-on-disk/test_002-013.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:686:test_002()/13 +location: clients/tests/test-client.py:689:test_002()/13 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 stdout: 304 bytes >>> NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 +AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1 WPA2 +AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected index d413833c7c..9c7183887b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-014.expected +++ b/clients/tests/test-client.check-on-disk/test_002-014.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:686:test_002()/14 +location: clients/tests/test-client.py:689:test_002()/14 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 stdout: 338 bytes >>> NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 +AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 +AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 44 ** WPA1 WPA2 +AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected index 550f5952b7..6bb91c88f3 100644 --- a/clients/tests/test-client.check-on-disk/test_002-015.expected +++ b/clients/tests/test-client.check-on-disk/test_002-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:687:test_002()/15 +location: clients/tests/test-client.py:690:test_002()/15 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 @@ -9,9 +9,9 @@ stdout: 460 bytes ========================== NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ---------------------------------------------------------------------------- -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 55 ** WPA1 WPA2 +AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1 WPA2 +AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected index fd99cb341d..3c7225d9bb 100644 --- a/clients/tests/test-client.check-on-disk/test_002-016.expected +++ b/clients/tests/test-client.check-on-disk/test_002-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:687:test_002()/16 +location: clients/tests/test-client.py:690:test_002()/16 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9,9 +9,9 @@ stdout: 530 bytes =================================== NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ----------------------------------------------------------------------------------- -AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 +AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 55 ** WPA1 WPA2 +AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 44 ** WPA1 WPA2 +AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected index f88a667f75..f2dcb5be35 100644 --- a/clients/tests/test-client.check-on-disk/test_002-017.expected +++ b/clients/tests/test-client.check-on-disk/test_002-017.expected @@ -1,12 +1,12 @@ -location: clients/tests/test-client.py:688:test_002()/17 +location: clients/tests/test-client.py:691:test_002()/17 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 stdout: 165 bytes >>> -AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2 -AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2 -AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2 +AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:55:** :WPA1 WPA2 +AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:44:** :WPA1 WPA2 +AP[3]: :wlan0-ap-2:Infra:1:54 Mbit/s:34:** :WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected index 7daed1325a..6ace788b71 100644 --- a/clients/tests/test-client.check-on-disk/test_002-018.expected +++ b/clients/tests/test-client.check-on-disk/test_002-018.expected @@ -1,12 +1,12 @@ -location: clients/tests/test-client.py:688:test_002()/18 +location: clients/tests/test-client.py:691:test_002()/18 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 stdout: 192 bytes >>> -AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:88:****:WPA1 WPA2 -AP[2]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:61:*** :WPA1 WPA2 -AP[3]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:29:* :WPA1 WPA2 +AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:55:** :WPA1 WPA2 +AP[2]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:44:** :WPA1 WPA2 +AP[3]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:34:** :WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected index 0fa220e7ce..06beacbe44 100644 --- a/clients/tests/test-client.check-on-disk/test_002-019.expected +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -1,16 +1,16 @@ -location: clients/tests/test-client.py:690:test_002()/19 +location: clients/tests/test-client.py:693:test_002()/19 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 stdout: 1840 bytes >>> NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 -AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 -AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infra 1 2412 MHz 54 Mbit/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 +AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infra 1 2412 MHz 54 Mbit/s 44 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 +AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infra 1 2412 MHz 54 Mbit/s 38 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected index 64ce4b82ab..243db4b410 100644 --- a/clients/tests/test-client.check-on-disk/test_002-020.expected +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -1,16 +1,16 @@ -location: clients/tests/test-client.py:690:test_002()/20 +location: clients/tests/test-client.py:693:test_002()/20 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 stdout: 1898 bytes >>> NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infrastruktura 1 2412 MHz 54 Mb/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 -AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infrastruktura 1 2412 MHz 54 Mb/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 -AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infrastruktura 1 2412 MHz 54 Mb/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[1] wlan0-ap-3 776C616E302D61702D33 60:B3:25:25:E2:C8 Infrastruktura 1 2412 MHz 54 Mb/s 55 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 +AP[2] wlan0-ap-1 776C616E302D61702D31 90:B1:5F:9E:E0:E3 Infrastruktura 1 2412 MHz 54 Mb/s 44 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 +AP[3] wlan0-ap-2 776C616E302D61702D32 61:66:D2:E7:44:A2 Infrastruktura 1 2412 MHz 54 Mb/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infrastruktura 1 2412 MHz 54 Mb/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 +AP[1] wlan1-ap-4 776C616E312D61702D34 EE:52:8B:49:A1:96 Infrastruktura 1 2412 MHz 54 Mb/s 38 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected index 09a0dcb321..3b6ae4df48 100644 --- a/clients/tests/test-client.check-on-disk/test_002-021.expected +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:692:test_002()/21 +location: clients/tests/test-client.py:695:test_002()/21 cmd: $NMCLI c lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected index 0c88e2c081..ea4cef7060 100644 --- a/clients/tests/test-client.check-on-disk/test_002-022.expected +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:692:test_002()/22 +location: clients/tests/test-client.py:695:test_002()/22 cmd: $NMCLI c lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected index dc484886f7..6b0d757636 100644 --- a/clients/tests/test-client.check-on-disk/test_002-023.expected +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:694:test_002()/23 +location: clients/tests/test-client.py:697:test_002()/23 cmd: $NMCLI c s con-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected index eca850e844..99a0dacc44 100644 --- a/clients/tests/test-client.check-on-disk/test_002-024.expected +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:694:test_002()/24 +location: clients/tests/test-client.py:697:test_002()/24 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected index 243a871a39..a28f33d903 100644 --- a/clients/tests/test-client.check-on-disk/test_003-001.expected +++ b/clients/tests/test-client.check-on-disk/test_003-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:704:test_003()/1 +location: clients/tests/test-client.py:707:test_003()/1 cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-002.expected b/clients/tests/test-client.check-on-disk/test_003-002.expected index 27cf1332b9..6f966c9e33 100644 --- a/clients/tests/test-client.check-on-disk/test_003-002.expected +++ b/clients/tests/test-client.check-on-disk/test_003-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:707:test_003()/2 +location: clients/tests/test-client.py:710:test_003()/2 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-003.expected b/clients/tests/test-client.check-on-disk/test_003-003.expected index 7dfadc81c2..7b3ce56b0a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-003.expected +++ b/clients/tests/test-client.check-on-disk/test_003-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:707:test_003()/3 +location: clients/tests/test-client.py:710:test_003()/3 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected index 665fdce1b5..7da0c6a3d1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-004.expected +++ b/clients/tests/test-client.check-on-disk/test_003-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:712:test_003()/4 +location: clients/tests/test-client.py:715:test_003()/4 cmd: $NMCLI c add type ethernet ifname '*' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected index 03cec03778..3883726233 100644 --- a/clients/tests/test-client.check-on-disk/test_003-005.expected +++ b/clients/tests/test-client.check-on-disk/test_003-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:715:test_003()/5 +location: clients/tests/test-client.py:718:test_003()/5 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected index 9e4a419d1e..2954811948 100644 --- a/clients/tests/test-client.check-on-disk/test_003-006.expected +++ b/clients/tests/test-client.check-on-disk/test_003-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:715:test_003()/6 +location: clients/tests/test-client.py:718:test_003()/6 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected index 1ad289db30..4f2acde854 100644 --- a/clients/tests/test-client.check-on-disk/test_003-007.expected +++ b/clients/tests/test-client.check-on-disk/test_003-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:718:test_003()/7 +location: clients/tests/test-client.py:721:test_003()/7 cmd: $NMCLI -f ALL c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected index 625a2b2d57..0567713bb6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-008.expected +++ b/clients/tests/test-client.check-on-disk/test_003-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:718:test_003()/8 +location: clients/tests/test-client.py:721:test_003()/8 cmd: $NMCLI -f ALL c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected index c60429c633..24612567e6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-009.expected +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:722:test_003()/9 +location: clients/tests/test-client.py:725:test_003()/9 cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected index 09a416a819..66a29b7ec5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-010.expected +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:722:test_003()/10 +location: clients/tests/test-client.py:725:test_003()/10 cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected index 9caf71cf58..72f07d14e4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-011.expected +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:735:test_003()/11 +location: clients/tests/test-client.py:738:test_003()/11 cmd: $NMCLI con up ethernet ifname eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected index a9069b27f8..2dd39d8165 100644 --- a/clients/tests/test-client.check-on-disk/test_003-012.expected +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:738:test_003()/12 +location: clients/tests/test-client.py:741:test_003()/12 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected index 868dcb6b53..792f0c2cda 100644 --- a/clients/tests/test-client.check-on-disk/test_003-013.expected +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:738:test_003()/13 +location: clients/tests/test-client.py:741:test_003()/13 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected index f6fcc73ff5..a195e46726 100644 --- a/clients/tests/test-client.check-on-disk/test_003-014.expected +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:741:test_003()/14 +location: clients/tests/test-client.py:744:test_003()/14 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected index 68496c4324..d2f12d7b64 100644 --- a/clients/tests/test-client.check-on-disk/test_003-015.expected +++ b/clients/tests/test-client.check-on-disk/test_003-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:741:test_003()/15 +location: clients/tests/test-client.py:744:test_003()/15 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected index a7eddb2128..2225c69fd3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-016.expected +++ b/clients/tests/test-client.check-on-disk/test_003-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:744:test_003()/16 +location: clients/tests/test-client.py:747:test_003()/16 cmd: $NMCLI -f ALL con s -a lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected index 3d86a7a596..482438d2f9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-017.expected +++ b/clients/tests/test-client.check-on-disk/test_003-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:744:test_003()/17 +location: clients/tests/test-client.py:747:test_003()/17 cmd: $NMCLI -f ALL con s -a lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected index b53d986074..60fec44810 100644 --- a/clients/tests/test-client.check-on-disk/test_003-018.expected +++ b/clients/tests/test-client.check-on-disk/test_003-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:747:test_003()/18 +location: clients/tests/test-client.py:750:test_003()/18 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected index 61df73a612..02419724d1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-019.expected +++ b/clients/tests/test-client.check-on-disk/test_003-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:747:test_003()/19 +location: clients/tests/test-client.py:750:test_003()/19 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected index f9a0d33da7..15fba095e6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-020.expected +++ b/clients/tests/test-client.check-on-disk/test_003-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:750:test_003()/20 +location: clients/tests/test-client.py:753:test_003()/20 cmd: $NMCLI -f UUID,NAME con s --active lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected index 5fa35e6309..df8215ee74 100644 --- a/clients/tests/test-client.check-on-disk/test_003-021.expected +++ b/clients/tests/test-client.check-on-disk/test_003-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:750:test_003()/21 +location: clients/tests/test-client.py:753:test_003()/21 cmd: $NMCLI -f UUID,NAME con s --active lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected index 0d4ed6d1e4..45a00b9c56 100644 --- a/clients/tests/test-client.check-on-disk/test_003-022.expected +++ b/clients/tests/test-client.check-on-disk/test_003-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:753:test_003()/22 +location: clients/tests/test-client.py:756:test_003()/22 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected index cc38634772..8b8b36f03c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-023.expected +++ b/clients/tests/test-client.check-on-disk/test_003-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:753:test_003()/23 +location: clients/tests/test-client.py:756:test_003()/23 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected index b82e1617c3..8cb51d0065 100644 --- a/clients/tests/test-client.check-on-disk/test_003-024.expected +++ b/clients/tests/test-client.check-on-disk/test_003-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:756:test_003()/24 +location: clients/tests/test-client.py:759:test_003()/24 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected index 112e322345..0a50377ba2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:756:test_003()/25 +location: clients/tests/test-client.py:759:test_003()/25 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected index 35b1ffb63e..0efa36e932 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:759:test_003()/26 +location: clients/tests/test-client.py:762:test_003()/26 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected index adb58deaf4..3ba057bd44 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:759:test_003()/27 +location: clients/tests/test-client.py:762:test_003()/27 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected index 408447ba17..26fbf2797a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:762:test_003()/28 +location: clients/tests/test-client.py:765:test_003()/28 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected index 2ff28af68f..49f58bf996 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:762:test_003()/29 +location: clients/tests/test-client.py:765:test_003()/29 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index 93a2513e3a..dccc4b6944 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:765:test_003()/30 +location: clients/tests/test-client.py:768:test_003()/30 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 @@ -12,7 +12,7 @@ GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual GENERAL.DRIVER-VERSION: -- GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.HWADDR: C0:61:AE:26:4D:D7 GENERAL.MTU: 0 GENERAL.STATE: 20 (unavailable) GENERAL.REASON: 0 (No reason given) diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index 19ba2d1296..42d7f70b25 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:765:test_003()/31 +location: clients/tests/test-client.py:768:test_003()/31 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -12,7 +12,7 @@ GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual GENERAL.DRIVER-VERSION: -- GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.HWADDR: C0:61:AE:26:4D:D7 GENERAL.MTU: 0 GENERAL.STATE: 20 (niedostępne) GENERAL.REASON: 0 (Nie podano przyczyny) diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected index 9f57c723ed..b5d45b992d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-032.expected +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:735:test_003()/32 +location: clients/tests/test-client.py:738:test_003()/32 cmd: $NMCLI con up ethernet ifname eth1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected index f4b98a0a16..b750b22c8b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-033.expected +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:738:test_003()/33 +location: clients/tests/test-client.py:741:test_003()/33 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected index febc026213..b7c4f5d2ea 100644 --- a/clients/tests/test-client.check-on-disk/test_003-034.expected +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:738:test_003()/34 +location: clients/tests/test-client.py:741:test_003()/34 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected index 66ea339784..d1055ffa5d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-035.expected +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:741:test_003()/35 +location: clients/tests/test-client.py:744:test_003()/35 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected index 417dfab9a4..f58f4a58c9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-036.expected +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:741:test_003()/36 +location: clients/tests/test-client.py:744:test_003()/36 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected index 70edda94b6..7eb974a6d4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-037.expected +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:744:test_003()/37 +location: clients/tests/test-client.py:747:test_003()/37 cmd: $NMCLI -f ALL con s -a lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected index 3ae757a601..5a09266ab6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-038.expected +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:744:test_003()/38 +location: clients/tests/test-client.py:747:test_003()/38 cmd: $NMCLI -f ALL con s -a lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected index f334165d3a..9a1f217372 100644 --- a/clients/tests/test-client.check-on-disk/test_003-039.expected +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:747:test_003()/39 +location: clients/tests/test-client.py:750:test_003()/39 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected index 1851b0bc52..37ebd08c83 100644 --- a/clients/tests/test-client.check-on-disk/test_003-040.expected +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:747:test_003()/40 +location: clients/tests/test-client.py:750:test_003()/40 cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected index 2461c1e418..10efe56489 100644 --- a/clients/tests/test-client.check-on-disk/test_003-041.expected +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:750:test_003()/41 +location: clients/tests/test-client.py:753:test_003()/41 cmd: $NMCLI -f UUID,NAME con s --active lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected index 88f1565683..13d86a0f39 100644 --- a/clients/tests/test-client.check-on-disk/test_003-042.expected +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:750:test_003()/42 +location: clients/tests/test-client.py:753:test_003()/42 cmd: $NMCLI -f UUID,NAME con s --active lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected index d467a333d7..80174c9b90 100644 --- a/clients/tests/test-client.check-on-disk/test_003-043.expected +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:753:test_003()/43 +location: clients/tests/test-client.py:756:test_003()/43 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected index 94a7e194c8..53bbce993c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-044.expected +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:753:test_003()/44 +location: clients/tests/test-client.py:756:test_003()/44 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected index 48891dd0d6..235ff6e2bd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-045.expected +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:756:test_003()/45 +location: clients/tests/test-client.py:759:test_003()/45 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected index 75929579df..6d803057e4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-046.expected +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:756:test_003()/46 +location: clients/tests/test-client.py:759:test_003()/46 cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected index 4a422037ee..c69543069d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-047.expected +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:759:test_003()/47 +location: clients/tests/test-client.py:762:test_003()/47 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected index 3ffb0bcb68..25a0f7babd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-048.expected +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:759:test_003()/48 +location: clients/tests/test-client.py:762:test_003()/48 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected index 934b11d172..1b8a855ade 100644 --- a/clients/tests/test-client.check-on-disk/test_003-049.expected +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:762:test_003()/49 +location: clients/tests/test-client.py:765:test_003()/49 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected index b59eb71659..c2b2628d61 100644 --- a/clients/tests/test-client.check-on-disk/test_003-050.expected +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:762:test_003()/50 +location: clients/tests/test-client.py:765:test_003()/50 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected index 4808d8d534..395b14675a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:765:test_003()/51 +location: clients/tests/test-client.py:768:test_003()/51 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 @@ -12,7 +12,7 @@ GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual GENERAL.DRIVER-VERSION: -- GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.HWADDR: C0:61:AE:26:4D:D7 GENERAL.MTU: 0 GENERAL.STATE: 20 (unavailable) GENERAL.REASON: 0 (No reason given) diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected index 4333c66ced..c6dc6dfb3f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:765:test_003()/52 +location: clients/tests/test-client.py:768:test_003()/52 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 @@ -12,7 +12,7 @@ GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual GENERAL.DRIVER-VERSION: -- GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.HWADDR: C0:61:AE:26:4D:D7 GENERAL.MTU: 0 GENERAL.STATE: 20 (niedostępne) GENERAL.REASON: 0 (Nie podano przyczyny) diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected index 0c7367e002..5cf2168278 100644 --- a/clients/tests/test-client.check-on-disk/test_003-053.expected +++ b/clients/tests/test-client.check-on-disk/test_003-053.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:779:test_003()/53 +location: clients/tests/test-client.py:782:test_003()/53 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected index 71df3141af..206d03e5c2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-054.expected +++ b/clients/tests/test-client.check-on-disk/test_003-054.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:779:test_003()/54 +location: clients/tests/test-client.py:782:test_003()/54 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected index abce51a659..cfce15d234 100644 --- a/clients/tests/test-client.check-on-disk/test_003-055.expected +++ b/clients/tests/test-client.check-on-disk/test_003-055.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:782:test_003()/55 +location: clients/tests/test-client.py:785:test_003()/55 cmd: $NMCLI -f UUID,TYPE con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected index 445885c0bd..135c11f106 100644 --- a/clients/tests/test-client.check-on-disk/test_003-056.expected +++ b/clients/tests/test-client.check-on-disk/test_003-056.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:782:test_003()/56 +location: clients/tests/test-client.py:785:test_003()/56 cmd: $NMCLI -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-057.expected b/clients/tests/test-client.check-on-disk/test_003-057.expected index 4e7e5d30ff..3d0e1134ad 100644 --- a/clients/tests/test-client.check-on-disk/test_003-057.expected +++ b/clients/tests/test-client.check-on-disk/test_003-057.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:785:test_003()/57 +location: clients/tests/test-client.py:788:test_003()/57 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-058.expected b/clients/tests/test-client.check-on-disk/test_003-058.expected index d491a07636..e179b11e72 100644 --- a/clients/tests/test-client.check-on-disk/test_003-058.expected +++ b/clients/tests/test-client.check-on-disk/test_003-058.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:785:test_003()/58 +location: clients/tests/test-client.py:788:test_003()/58 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-059.expected b/clients/tests/test-client.check-on-disk/test_003-059.expected index 47872594e9..9914e7618e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-059.expected +++ b/clients/tests/test-client.check-on-disk/test_003-059.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:788:test_003()/59 +location: clients/tests/test-client.py:791:test_003()/59 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-060.expected b/clients/tests/test-client.check-on-disk/test_003-060.expected index 81e8d9cd90..8a013eb157 100644 --- a/clients/tests/test-client.check-on-disk/test_003-060.expected +++ b/clients/tests/test-client.check-on-disk/test_003-060.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:788:test_003()/60 +location: clients/tests/test-client.py:791:test_003()/60 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-061.expected b/clients/tests/test-client.check-on-disk/test_003-061.expected index 53c4fdbb1c..5bde3ac412 100644 --- a/clients/tests/test-client.check-on-disk/test_003-061.expected +++ b/clients/tests/test-client.check-on-disk/test_003-061.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:791:test_003()/61 +location: clients/tests/test-client.py:794:test_003()/61 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected index 61020a0ca6..7826ba6cc4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-062.expected +++ b/clients/tests/test-client.check-on-disk/test_003-062.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:791:test_003()/62 +location: clients/tests/test-client.py:794:test_003()/62 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected index 6251d8a210..30c85d64e8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-063.expected +++ b/clients/tests/test-client.check-on-disk/test_003-063.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:794:test_003()/63 +location: clients/tests/test-client.py:797:test_003()/63 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected index 1fbe313f33..38f487f241 100644 --- a/clients/tests/test-client.check-on-disk/test_003-064.expected +++ b/clients/tests/test-client.check-on-disk/test_003-064.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:794:test_003()/64 +location: clients/tests/test-client.py:797:test_003()/64 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected index 42cf1e41ca..7093ba8047 100644 --- a/clients/tests/test-client.check-on-disk/test_003-065.expected +++ b/clients/tests/test-client.check-on-disk/test_003-065.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:797:test_003()/65 +location: clients/tests/test-client.py:800:test_003()/65 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected index 5ee5641c85..1b441dec58 100644 --- a/clients/tests/test-client.check-on-disk/test_003-066.expected +++ b/clients/tests/test-client.check-on-disk/test_003-066.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:797:test_003()/66 +location: clients/tests/test-client.py:800:test_003()/66 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected index 395db669a4..cf884edd07 100644 --- a/clients/tests/test-client.check-on-disk/test_003-067.expected +++ b/clients/tests/test-client.check-on-disk/test_003-067.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:800:test_003()/67 +location: clients/tests/test-client.py:803:test_003()/67 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected index 9c118600b8..a928a88d65 100644 --- a/clients/tests/test-client.check-on-disk/test_003-068.expected +++ b/clients/tests/test-client.check-on-disk/test_003-068.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:800:test_003()/68 +location: clients/tests/test-client.py:803:test_003()/68 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected index 1c66969c63..ec092f7b7c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-069.expected +++ b/clients/tests/test-client.check-on-disk/test_003-069.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:803:test_003()/69 +location: clients/tests/test-client.py:806:test_003()/69 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected index 984d9d4fa0..2dc0faaa47 100644 --- a/clients/tests/test-client.check-on-disk/test_003-070.expected +++ b/clients/tests/test-client.check-on-disk/test_003-070.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:803:test_003()/70 +location: clients/tests/test-client.py:806:test_003()/70 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected index 41e45a8aa1..e07cfc7dc1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-071.expected +++ b/clients/tests/test-client.check-on-disk/test_003-071.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:806:test_003()/71 +location: clients/tests/test-client.py:809:test_003()/71 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected index 584effd8fd..baddcd6e2e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-072.expected +++ b/clients/tests/test-client.check-on-disk/test_003-072.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:806:test_003()/72 +location: clients/tests/test-client.py:809:test_003()/72 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected index f075f44b52..7a7bda97ad 100644 --- a/clients/tests/test-client.check-on-disk/test_003-073.expected +++ b/clients/tests/test-client.check-on-disk/test_003-073.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:779:test_003()/73 +location: clients/tests/test-client.py:782:test_003()/73 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-074.expected b/clients/tests/test-client.check-on-disk/test_003-074.expected index ee9c4800f6..b123899781 100644 --- a/clients/tests/test-client.check-on-disk/test_003-074.expected +++ b/clients/tests/test-client.check-on-disk/test_003-074.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:779:test_003()/74 +location: clients/tests/test-client.py:782:test_003()/74 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected index 098b1e708d..4c6a41089a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-075.expected +++ b/clients/tests/test-client.check-on-disk/test_003-075.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:782:test_003()/75 +location: clients/tests/test-client.py:785:test_003()/75 cmd: $NMCLI -f UUID,TYPE con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected index 4604e7b28d..22e1f5d638 100644 --- a/clients/tests/test-client.check-on-disk/test_003-076.expected +++ b/clients/tests/test-client.check-on-disk/test_003-076.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:782:test_003()/76 +location: clients/tests/test-client.py:785:test_003()/76 cmd: $NMCLI -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected index a47242310a..fc1a98c39b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-077.expected +++ b/clients/tests/test-client.check-on-disk/test_003-077.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:785:test_003()/77 +location: clients/tests/test-client.py:788:test_003()/77 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected index 83a0371b24..235784b300 100644 --- a/clients/tests/test-client.check-on-disk/test_003-078.expected +++ b/clients/tests/test-client.check-on-disk/test_003-078.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:785:test_003()/78 +location: clients/tests/test-client.py:788:test_003()/78 cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected index 22fd0414e4..1d29e2eee7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-079.expected +++ b/clients/tests/test-client.check-on-disk/test_003-079.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:788:test_003()/79 +location: clients/tests/test-client.py:791:test_003()/79 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-080.expected b/clients/tests/test-client.check-on-disk/test_003-080.expected index fb45478d79..7140e0f6e5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-080.expected +++ b/clients/tests/test-client.check-on-disk/test_003-080.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:788:test_003()/80 +location: clients/tests/test-client.py:791:test_003()/80 cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-081.expected b/clients/tests/test-client.check-on-disk/test_003-081.expected index 8c06c49059..11b6b39501 100644 --- a/clients/tests/test-client.check-on-disk/test_003-081.expected +++ b/clients/tests/test-client.check-on-disk/test_003-081.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:791:test_003()/81 +location: clients/tests/test-client.py:794:test_003()/81 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-082.expected b/clients/tests/test-client.check-on-disk/test_003-082.expected index 936aadfa58..39fe6f5275 100644 --- a/clients/tests/test-client.check-on-disk/test_003-082.expected +++ b/clients/tests/test-client.check-on-disk/test_003-082.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:791:test_003()/82 +location: clients/tests/test-client.py:794:test_003()/82 cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-083.expected b/clients/tests/test-client.check-on-disk/test_003-083.expected index 3a8381bb65..6b9dc5c8db 100644 --- a/clients/tests/test-client.check-on-disk/test_003-083.expected +++ b/clients/tests/test-client.check-on-disk/test_003-083.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:794:test_003()/83 +location: clients/tests/test-client.py:797:test_003()/83 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-084.expected b/clients/tests/test-client.check-on-disk/test_003-084.expected index 7f20b7ebf4..e49e2808fb 100644 --- a/clients/tests/test-client.check-on-disk/test_003-084.expected +++ b/clients/tests/test-client.check-on-disk/test_003-084.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:794:test_003()/84 +location: clients/tests/test-client.py:797:test_003()/84 cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-085.expected b/clients/tests/test-client.check-on-disk/test_003-085.expected index d0532d5f26..09e3359afc 100644 --- a/clients/tests/test-client.check-on-disk/test_003-085.expected +++ b/clients/tests/test-client.check-on-disk/test_003-085.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:797:test_003()/85 +location: clients/tests/test-client.py:800:test_003()/85 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-086.expected b/clients/tests/test-client.check-on-disk/test_003-086.expected index e5aef27f89..bc3c33b64d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-086.expected +++ b/clients/tests/test-client.check-on-disk/test_003-086.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:797:test_003()/86 +location: clients/tests/test-client.py:800:test_003()/86 cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-087.expected b/clients/tests/test-client.check-on-disk/test_003-087.expected index 7a3e5173f0..63654ed081 100644 --- a/clients/tests/test-client.check-on-disk/test_003-087.expected +++ b/clients/tests/test-client.check-on-disk/test_003-087.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:800:test_003()/87 +location: clients/tests/test-client.py:803:test_003()/87 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-088.expected b/clients/tests/test-client.check-on-disk/test_003-088.expected index d4498c8e0a..6a3c2024fa 100644 --- a/clients/tests/test-client.check-on-disk/test_003-088.expected +++ b/clients/tests/test-client.check-on-disk/test_003-088.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:800:test_003()/88 +location: clients/tests/test-client.py:803:test_003()/88 cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-089.expected b/clients/tests/test-client.check-on-disk/test_003-089.expected index b446745180..224f85c806 100644 --- a/clients/tests/test-client.check-on-disk/test_003-089.expected +++ b/clients/tests/test-client.check-on-disk/test_003-089.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:803:test_003()/89 +location: clients/tests/test-client.py:806:test_003()/89 cmd: $NMCLI con s ethernet lang: C returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_003-090.expected b/clients/tests/test-client.check-on-disk/test_003-090.expected index b6f9b4dfda..37ed36703e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-090.expected +++ b/clients/tests/test-client.check-on-disk/test_003-090.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:803:test_003()/90 +location: clients/tests/test-client.py:806:test_003()/90 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_003-091.expected b/clients/tests/test-client.check-on-disk/test_003-091.expected index 701b63b92a..2ca03c8cba 100644 --- a/clients/tests/test-client.check-on-disk/test_003-091.expected +++ b/clients/tests/test-client.check-on-disk/test_003-091.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:806:test_003()/91 +location: clients/tests/test-client.py:809:test_003()/91 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-092.expected b/clients/tests/test-client.check-on-disk/test_003-092.expected index c1ab0b123e..4d43a4a4c6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-092.expected +++ b/clients/tests/test-client.check-on-disk/test_003-092.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:806:test_003()/92 +location: clients/tests/test-client.py:809:test_003()/92 cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-001.expected b/clients/tests/test-client.check-on-disk/test_004-001.expected index fbb979541b..9cb9f227d7 100644 --- a/clients/tests/test-client.check-on-disk/test_004-001.expected +++ b/clients/tests/test-client.check-on-disk/test_004-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:816:test_004()/1 +location: clients/tests/test-client.py:819:test_004()/1 cmd: $NMCLI c add type wifi ifname '*' ssid foobar con-name con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-002.expected b/clients/tests/test-client.check-on-disk/test_004-002.expected index d81eba70b3..b83687557b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-002.expected +++ b/clients/tests/test-client.check-on-disk/test_004-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:818:test_004()/2 +location: clients/tests/test-client.py:821:test_004()/2 cmd: $NMCLI connection mod con-xx1 ip.gateway '' lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_004-003.expected b/clients/tests/test-client.check-on-disk/test_004-003.expected index 738f2c73ec..b12341c5a4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-003.expected +++ b/clients/tests/test-client.check-on-disk/test_004-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:819:test_004()/3 +location: clients/tests/test-client.py:822:test_004()/3 cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1 lang: pl_PL.UTF-8 returncode: 1 diff --git a/clients/tests/test-client.check-on-disk/test_004-004.expected b/clients/tests/test-client.check-on-disk/test_004-004.expected index 84231a0c19..797937d75f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-004.expected +++ b/clients/tests/test-client.check-on-disk/test_004-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:820:test_004()/4 +location: clients/tests/test-client.py:823:test_004()/4 cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99 lang: C returncode: 1 diff --git a/clients/tests/test-client.check-on-disk/test_004-005.expected b/clients/tests/test-client.check-on-disk/test_004-005.expected index 78d852cc8b..b976143dc5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-005.expected +++ b/clients/tests/test-client.check-on-disk/test_004-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:821:test_004()/5 +location: clients/tests/test-client.py:824:test_004()/5 cmd: $NMCLI connection mod con-xx1 802.abc '' lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_004-006.expected b/clients/tests/test-client.check-on-disk/test_004-006.expected index 8d1d5eb9a4..5115ea1e71 100644 --- a/clients/tests/test-client.check-on-disk/test_004-006.expected +++ b/clients/tests/test-client.check-on-disk/test_004-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:822:test_004()/6 +location: clients/tests/test-client.py:825:test_004()/6 cmd: $NMCLI connection mod con-xx1 802-11-wireless.band a lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-007.expected b/clients/tests/test-client.check-on-disk/test_004-007.expected index 791be0c92c..1f52f4e720 100644 --- a/clients/tests/test-client.check-on-disk/test_004-007.expected +++ b/clients/tests/test-client.check-on-disk/test_004-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:823:test_004()/7 +location: clients/tests/test-client.py:826:test_004()/7 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-008.expected b/clients/tests/test-client.check-on-disk/test_004-008.expected index 5ebbb1a792..6b53a83708 100644 --- a/clients/tests/test-client.check-on-disk/test_004-008.expected +++ b/clients/tests/test-client.check-on-disk/test_004-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:825:test_004()/8 +location: clients/tests/test-client.py:828:test_004()/8 cmd: $NMCLI con s con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-009.expected b/clients/tests/test-client.check-on-disk/test_004-009.expected index 164ba4d92c..81131d3364 100644 --- a/clients/tests/test-client.check-on-disk/test_004-009.expected +++ b/clients/tests/test-client.check-on-disk/test_004-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:825:test_004()/9 +location: clients/tests/test-client.py:828:test_004()/9 cmd: $NMCLI con s con-xx1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-010.expected b/clients/tests/test-client.check-on-disk/test_004-010.expected index be6281d36e..f502c7180d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-010.expected +++ b/clients/tests/test-client.check-on-disk/test_004-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:832:test_004()/10 +location: clients/tests/test-client.py:835:test_004()/10 cmd: $NMCLI connection add type vpn con-name con-vpn-1 ifname '*' vpn-type openvpn vpn.data 'key1 = val1, key2 = val2, key3=val3' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-011.expected b/clients/tests/test-client.check-on-disk/test_004-011.expected index 975db506a1..158241e7a7 100644 --- a/clients/tests/test-client.check-on-disk/test_004-011.expected +++ b/clients/tests/test-client.check-on-disk/test_004-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:835:test_004()/11 +location: clients/tests/test-client.py:838:test_004()/11 cmd: $NMCLI con s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-012.expected b/clients/tests/test-client.check-on-disk/test_004-012.expected index f5280f9554..65de04bc85 100644 --- a/clients/tests/test-client.check-on-disk/test_004-012.expected +++ b/clients/tests/test-client.check-on-disk/test_004-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:835:test_004()/12 +location: clients/tests/test-client.py:838:test_004()/12 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-013.expected b/clients/tests/test-client.check-on-disk/test_004-013.expected index e9244afa57..8f7381fb3c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-013.expected +++ b/clients/tests/test-client.check-on-disk/test_004-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:837:test_004()/13 +location: clients/tests/test-client.py:840:test_004()/13 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-014.expected b/clients/tests/test-client.check-on-disk/test_004-014.expected index 958ffb6f6d..57c13711b6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-014.expected +++ b/clients/tests/test-client.check-on-disk/test_004-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:837:test_004()/14 +location: clients/tests/test-client.py:840:test_004()/14 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-015.expected b/clients/tests/test-client.check-on-disk/test_004-015.expected index 0284276118..863e5f4fc1 100644 --- a/clients/tests/test-client.check-on-disk/test_004-015.expected +++ b/clients/tests/test-client.check-on-disk/test_004-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:839:test_004()/15 +location: clients/tests/test-client.py:842:test_004()/15 cmd: $NMCLI con up con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-016.expected b/clients/tests/test-client.check-on-disk/test_004-016.expected index a7cf6e962e..69f902dc86 100644 --- a/clients/tests/test-client.check-on-disk/test_004-016.expected +++ b/clients/tests/test-client.check-on-disk/test_004-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:841:test_004()/16 +location: clients/tests/test-client.py:844:test_004()/16 cmd: $NMCLI con s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-017.expected b/clients/tests/test-client.check-on-disk/test_004-017.expected index f1421e5948..e125cb8ae2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-017.expected +++ b/clients/tests/test-client.check-on-disk/test_004-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:841:test_004()/17 +location: clients/tests/test-client.py:844:test_004()/17 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-018.expected b/clients/tests/test-client.check-on-disk/test_004-018.expected index f3cd80a746..4cab2aee8b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-018.expected +++ b/clients/tests/test-client.check-on-disk/test_004-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:843:test_004()/18 +location: clients/tests/test-client.py:846:test_004()/18 cmd: $NMCLI con up con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-019.expected b/clients/tests/test-client.check-on-disk/test_004-019.expected index 0f3c3909fb..c7ceb89c20 100644 --- a/clients/tests/test-client.check-on-disk/test_004-019.expected +++ b/clients/tests/test-client.check-on-disk/test_004-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:845:test_004()/19 +location: clients/tests/test-client.py:848:test_004()/19 cmd: $NMCLI con s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-020.expected b/clients/tests/test-client.check-on-disk/test_004-020.expected index 35ab7b1dfa..2da441a184 100644 --- a/clients/tests/test-client.check-on-disk/test_004-020.expected +++ b/clients/tests/test-client.check-on-disk/test_004-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:845:test_004()/20 +location: clients/tests/test-client.py:848:test_004()/20 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 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 6a1174f7b9..8be324105f 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 @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:847:test_004()/21 +location: clients/tests/test-client.py:850:test_004()/21 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 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 1e5fce1bf0..50c01f2854 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 @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:847:test_004()/22 +location: clients/tests/test-client.py:850:test_004()/22 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-023.expected b/clients/tests/test-client.check-on-disk/test_004-023.expected index a3c7ab2e6d..5be2d83299 100644 --- a/clients/tests/test-client.check-on-disk/test_004-023.expected +++ b/clients/tests/test-client.check-on-disk/test_004-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:856:test_004()/23 +location: clients/tests/test-client.py:859:test_004()/23 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-024.expected b/clients/tests/test-client.check-on-disk/test_004-024.expected index d9a40e4c09..e05d8f2de0 100644 --- a/clients/tests/test-client.check-on-disk/test_004-024.expected +++ b/clients/tests/test-client.check-on-disk/test_004-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:856:test_004()/24 +location: clients/tests/test-client.py:859:test_004()/24 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-025.expected b/clients/tests/test-client.check-on-disk/test_004-025.expected index d7bf8f2e3e..446700c2d0 100644 --- a/clients/tests/test-client.check-on-disk/test_004-025.expected +++ b/clients/tests/test-client.check-on-disk/test_004-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:858:test_004()/25 +location: clients/tests/test-client.py:861:test_004()/25 cmd: $NMCLI -t con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected index a56c7df87f..d15eb96bea 100644 --- a/clients/tests/test-client.check-on-disk/test_004-026.expected +++ b/clients/tests/test-client.check-on-disk/test_004-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:858:test_004()/26 +location: clients/tests/test-client.py:861:test_004()/26 cmd: $NMCLI -t con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-027.expected b/clients/tests/test-client.check-on-disk/test_004-027.expected index ca328e8fe2..f11fdafc0a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-027.expected +++ b/clients/tests/test-client.check-on-disk/test_004-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:861:test_004()/27 +location: clients/tests/test-client.py:864:test_004()/27 cmd: $NMCLI -f ALL con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-028.expected b/clients/tests/test-client.check-on-disk/test_004-028.expected index a84be56cb5..e1e71ebc22 100644 --- a/clients/tests/test-client.check-on-disk/test_004-028.expected +++ b/clients/tests/test-client.check-on-disk/test_004-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:861:test_004()/28 +location: clients/tests/test-client.py:864:test_004()/28 cmd: $NMCLI -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-029.expected b/clients/tests/test-client.check-on-disk/test_004-029.expected index 2cc160349f..76ce58dc71 100644 --- a/clients/tests/test-client.check-on-disk/test_004-029.expected +++ b/clients/tests/test-client.check-on-disk/test_004-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:867:test_004()/29 +location: clients/tests/test-client.py:870:test_004()/29 cmd: $NMCLI -f VPN con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-030.expected b/clients/tests/test-client.check-on-disk/test_004-030.expected index 31933fd534..9ad1dfaeb9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-030.expected +++ b/clients/tests/test-client.check-on-disk/test_004-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:867:test_004()/30 +location: clients/tests/test-client.py:870:test_004()/30 cmd: $NMCLI -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-031.expected b/clients/tests/test-client.check-on-disk/test_004-031.expected index 6d18ca3b6d..22ea1fa18e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-031.expected +++ b/clients/tests/test-client.check-on-disk/test_004-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:870:test_004()/31 +location: clients/tests/test-client.py:873:test_004()/31 cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-032.expected b/clients/tests/test-client.check-on-disk/test_004-032.expected index da930659c0..66d2031a8d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-032.expected +++ b/clients/tests/test-client.check-on-disk/test_004-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:870:test_004()/32 +location: clients/tests/test-client.py:873:test_004()/32 cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-033.expected b/clients/tests/test-client.check-on-disk/test_004-033.expected index a777dcdc62..f4a9f523e5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-033.expected +++ b/clients/tests/test-client.check-on-disk/test_004-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:873:test_004()/33 +location: clients/tests/test-client.py:876:test_004()/33 cmd: $NMCLI dev show wlan0 lang: C returncode: 0 @@ -6,7 +6,7 @@ stdout: 389 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi -GENERAL.HWADDR: 5A:88:5E:B6:90:40 +GENERAL.HWADDR: 13:E0:74:85:7C:D9 GENERAL.MTU: 0 GENERAL.STATE: 20 (unavailable) GENERAL.CONNECTION: con-vpn-1 diff --git a/clients/tests/test-client.check-on-disk/test_004-034.expected b/clients/tests/test-client.check-on-disk/test_004-034.expected index b09be6fae0..058081e816 100644 --- a/clients/tests/test-client.check-on-disk/test_004-034.expected +++ b/clients/tests/test-client.check-on-disk/test_004-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:873:test_004()/34 +location: clients/tests/test-client.py:876:test_004()/34 cmd: $NMCLI dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -6,7 +6,7 @@ stdout: 390 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi -GENERAL.HWADDR: 5A:88:5E:B6:90:40 +GENERAL.HWADDR: 13:E0:74:85:7C:D9 GENERAL.MTU: 0 GENERAL.STATE: 20 (niedostępne) GENERAL.CONNECTION: con-vpn-1 diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected index 9aed5fd6ff..d0af2ea4ae 100644 --- a/clients/tests/test-client.check-on-disk/test_004-035.expected +++ b/clients/tests/test-client.check-on-disk/test_004-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:876:test_004()/35 +location: clients/tests/test-client.py:879:test_004()/35 cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 @@ -12,7 +12,7 @@ GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual GENERAL.DRIVER-VERSION: -- GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 5A:88:5E:B6:90:40 +GENERAL.HWADDR: 13:E0:74:85:7C:D9 GENERAL.MTU: 0 GENERAL.STATE: 20 (unavailable) GENERAL.REASON: 0 (No reason given) @@ -42,28 +42,28 @@ WIFI-PROPERTIES.ADHOC: yes WIFI-PROPERTIES.2GHZ: unknown WIFI-PROPERTIES.5GHZ: unknown AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 +AP[1].SSID: wlan0-ap-2 AP[1].MODE: Infra AP[1].CHAN: 1 AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 +AP[1].SIGNAL: 92 AP[1].BARS: **** AP[1].SECURITY: WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infra AP[2].CHAN: 1 AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 81 +AP[2].BARS: **** AP[2].SECURITY: WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-3 AP[3].MODE: Infra AP[3].CHAN: 1 AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 55 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected index 9b2e7c7331..2fdb18752d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-036.expected +++ b/clients/tests/test-client.check-on-disk/test_004-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:876:test_004()/36 +location: clients/tests/test-client.py:879:test_004()/36 cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -12,7 +12,7 @@ GENERAL.PRODUCT: -- GENERAL.DRIVER: virtual GENERAL.DRIVER-VERSION: -- GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 5A:88:5E:B6:90:40 +GENERAL.HWADDR: 13:E0:74:85:7C:D9 GENERAL.MTU: 0 GENERAL.STATE: 20 (niedostępne) GENERAL.REASON: 0 (Nie podano przyczyny) @@ -42,28 +42,28 @@ WIFI-PROPERTIES.ADHOC: tak WIFI-PROPERTIES.2GHZ: nieznane WIFI-PROPERTIES.5GHZ: nieznane AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 +AP[1].SSID: wlan0-ap-2 AP[1].MODE: Infrastruktura AP[1].CHAN: 1 AP[1].RATE: 54 Mb/s -AP[1].SIGNAL: 88 +AP[1].SIGNAL: 92 AP[1].BARS: **** AP[1].SECURITY: WPA1 WPA2 AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 +AP[2].SSID: wlan0-ap-1 AP[2].MODE: Infrastruktura AP[2].CHAN: 1 AP[2].RATE: 54 Mb/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** +AP[2].SIGNAL: 81 +AP[2].BARS: **** AP[2].SECURITY: WPA1 WPA2 AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 +AP[3].SSID: wlan0-ap-3 AP[3].MODE: Infrastruktura AP[3].CHAN: 1 AP[3].RATE: 54 Mb/s -AP[3].SIGNAL: 29 -AP[3].BARS: * +AP[3].SIGNAL: 55 +AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 63ad790a99..2d4a1803d9 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -165,7 +165,7 @@ class Util: @staticmethod def debug_dbus_interface(): # this is for printf debugging, not used in actual code. - os.system('busctl --user --verbose call org.freedesktop.NetworkManager /org/freedesktop org.freedesktop.DBus.ObjectManager GetManagedObjects') + os.system('busctl --user --verbose call org.freedesktop.NetworkManager /org/freedesktop org.freedesktop.DBus.ObjectManager GetManagedObjects | cat') ############################################################################### @@ -224,11 +224,14 @@ class NMStubServer: except: return None - def __init__(self): + def __init__(self, seed): service_path = PathConfiguration.test_networkmanager_service_path() self._conn = dbus.SessionBus() + env = os.environ.copy() + env['NM_TEST_NETWORKMANAGER_SERVICE_SEED'] = seed p = subprocess.Popen([sys.executable, service_path], - stdin = subprocess.PIPE) + stdin = subprocess.PIPE, + env = env) start = nmex.nm_boot_time_ns() while True: @@ -599,7 +602,7 @@ class TestNmcli(NmTestBase): self.skipTest("Own D-Bus session for testing is not initialized. Do you have dbus-run-session available?") if NM is None: self.skipTest("gi.NM is not available. Did you build with introspection?") - self.srv = NMStubServer() + self.srv = NMStubServer(self._testMethodName) self._calling_num = {} self._skip_test_for_l10n_diff = [] self._async_jobs = [] diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index 0cbb5e452c..cdf8e5743e 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -15,11 +15,11 @@ except Exception as e: print("Cannot load gi.NM: %s" % (str(e))) sys.exit(77) +import os import dbus import dbus.service import dbus.mainloop.glib import random -import collections import uuid import hashlib import collections @@ -46,39 +46,111 @@ class TestError(AssertionError): class Util: + class RandomSeed(): + def __init__(self, seed): + self.cnt = 0 + self.seed = str(seed) + def _next(self): + c = self.cnt + self.cnt += 1 + return self.seed + '-' + str(c) + @staticmethod + def wrap(seed): + if seed is None: + return None + if isinstance(seed, Util.RandomSeed): + return seed + return Util.RandomSeed(seed) + @staticmethod + def get(seed, extra_seed = None): + if seed is None: + return None + if isinstance(seed, Util.RandomSeed): + seed = seed._next() + else: + seed = str(seed) + if extra_seed is None: + try: + extra_seed = Util.RandomSeed._extra_seed + except: + extra_seed = os.environ.get('NM_TEST_NETWORKMANAGER_SERVICE_SEED', '') + Util.RandomSeed._extra_seed = extra_seed + return extra_seed + seed + @staticmethod - def pseudorandom_stream(seed, length = None): - seed = str(seed) + def random_stream(seed, length = None): + seed = Util.RandomSeed.wrap(seed) + # generates a stream of integers, in the range [0..255] + if seed is None: + # without a seed, we generate new random numbers. + while length is None or length > 0: + yield random.randint(0, 255) + if length is not None: + length -= 1 + return v = None - i = 0 while length is None or length > 0: if not v: - s = seed + str(i) + s = Util.RandomSeed.get(seed) s = s.encode('utf8') v = hashlib.sha256(s).hexdigest() - i += 1 yield int(v[0:2], 16) v = v[2:] if length is not None: length -= 1 @staticmethod - def pseudorandom_num(seed, v_end, v_start = 0): + def random_int(seed, v_start = _DEFAULT_ARG, v_end = _DEFAULT_ARG): + # - if neither start not end is give, return a number in the range + # u32 range [0, 0xFFFFFFFF] + # - if only start is given (the first argument), interpret it as + # the range of the interval. That is, return random number in + # range [0, start-1] + # - if end and start is given, return a random number with this + # range (inclusive!): [start, end] + if v_end is _DEFAULT_ARG: + # if only one edge is provided (no v_end), then the range + # is [0, v_start[. That is, random_int(seed, 5), returns + # values from 0 to 4. + if v_start is _DEFAULT_ARG: + # by default, return a 32u integer. + v_end = 0x100000000 + else: + v_end = v_start + v_start = 0 + else: + if v_start is _DEFAULT_ARG: + raise TestError("Cannot specify end without start") + # if a full range is provided, v_end is included. + # random_int(seed, 0, 4) returns values from 0 to 4. + v_end += 1 n = 0 span = v_end - v_start - for r in Util.pseudorandom_stream(seed): + assert span > 0 + for r in Util.random_stream(seed): n = n * 256 + r if n > span: break return v_start + (n % span) @staticmethod - def random_mac(seed = None): - if seed is None: - r = tuple([random.randint(0, 255) for x in range(6)]) - else: - r = tuple(Util.pseudorandom_stream(seed, 6)) - return '%02X:%02X:%02X:%02X:%02X:%02X' % r + def random_bool(seed): + return Util.random_int(seed, 0, 1) == 1 + + @staticmethod + def random_subset(seed, all_set): + all_set = list(all_set) + result = [] + seed = Util.RandomSeed.wrap(seed) + for i in list(range(Util.random_int(Util.RandomSeed.get(seed), len(all_set) + 1))): + idx = Util.random_int(Util.RandomSeed.get(seed), len(all_set)) + result.append(all_set[idx]) + del all_set[idx] + return result + + @staticmethod + def random_mac(seed): + return '%02X:%02X:%02X:%02X:%02X:%02X' % tuple(Util.random_stream(seed, 6)) @staticmethod def eprint(*args, **kwargs): @@ -643,7 +715,7 @@ class WifiAp(ExportedObj): if bssid is None: bssid = Util.random_mac(self.path) if strength is None: - strength = Util.pseudorandom_num(self.path, 100) + strength = Util.random_int(self.path, 100) self.ssid = ssid self.strength_counter = 0 @@ -670,7 +742,7 @@ class WifiAp(ExportedObj): def strength_cb(self, ignored): self.strength_counter += 1 - strength = Util.pseudorandom_num(self.path + str(self.strength_counter), 100) + strength = Util.random_int(self.path + str(self.strength_counter), 100) self._dbus_property_set(IFACE_WIFI_AP, PRP_WIFI_AP_STRENGTH, strength) return True From f671fa51378675fd1c6e25b760c0b6fc8db4a5b5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 6 Jun 2018 20:28:17 +0200 Subject: [PATCH 6/8] clients/tests: expose IP and DHCP configs in test-networkmanager-service.py stub For adding tests what nmcli shows regarding IP and DHCP configuration, let the stub service generate config instances. --- .../test_003-030.expected | 24 +- .../test_003-031.expected | 24 +- .../test_003-051.expected | 24 +- .../test_003-052.expected | 24 +- .../test_004-033.expected | 19 +- .../test_004-034.expected | 19 +- .../test_004-035.expected | 28 +- .../test_004-036.expected | 28 +- tools/test-networkmanager-service.py | 505 +++++++++++++++++- 9 files changed, 682 insertions(+), 13 deletions(-) diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index dccc4b6944..c43d78bb23 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:768:test_003()/30 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 1793 bytes +stdout: 3239 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -33,6 +33,28 @@ CAPABILITIES.SPEED: 100 Mb/s CAPABILITIES.IS-SOFTWARE: no CAPABILITIES.SRIOV: no WIRED-PROPERTIES.CARRIER: off +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index 42d7f70b25..c4d3f92aaf 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:768:test_003()/31 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1816 bytes +stdout: 3262 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -33,6 +33,28 @@ CAPABILITIES.SPEED: 100 Mb/s CAPABILITIES.IS-SOFTWARE: nie CAPABILITIES.SRIOV: nie WIRED-PROPERTIES.CARRIER: wyłączone +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected index 395b14675a..55d542bd5a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:768:test_003()/51 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 1793 bytes +stdout: 3239 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -33,6 +33,28 @@ CAPABILITIES.SPEED: 100 Mb/s CAPABILITIES.IS-SOFTWARE: no CAPABILITIES.SRIOV: no WIRED-PROPERTIES.CARRIER: off +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected index c6dc6dfb3f..45c22a18fd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:768:test_003()/52 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1816 bytes +stdout: 3262 bytes >>> GENERAL.DEVICE: eth0 GENERAL.TYPE: ethernet @@ -33,6 +33,28 @@ CAPABILITIES.SPEED: 100 Mb/s CAPABILITIES.IS-SOFTWARE: nie CAPABILITIES.SRIOV: nie WIRED-PROPERTIES.CARRIER: wyłączone +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 diff --git a/clients/tests/test-client.check-on-disk/test_004-033.expected b/clients/tests/test-client.check-on-disk/test_004-033.expected index f4a9f523e5..a86acc632a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-033.expected +++ b/clients/tests/test-client.check-on-disk/test_004-033.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:876:test_004()/33 cmd: $NMCLI dev show wlan0 lang: C returncode: 0 -stdout: 389 bytes +stdout: 1363 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -11,6 +11,23 @@ GENERAL.MTU: 0 GENERAL.STATE: 20 (unavailable) GENERAL.CONNECTION: con-vpn-1 GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-034.expected b/clients/tests/test-client.check-on-disk/test_004-034.expected index 058081e816..fa5327a678 100644 --- a/clients/tests/test-client.check-on-disk/test_004-034.expected +++ b/clients/tests/test-client.check-on-disk/test_004-034.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:876:test_004()/34 cmd: $NMCLI dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 390 bytes +stdout: 1364 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -11,6 +11,23 @@ GENERAL.MTU: 0 GENERAL.STATE: 20 (niedostępne) GENERAL.CONNECTION: con-vpn-1 GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected index d0af2ea4ae..2f878f84bb 100644 --- a/clients/tests/test-client.check-on-disk/test_004-035.expected +++ b/clients/tests/test-client.check-on-disk/test_004-035.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:879:test_004()/35 cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 -stdout: 3077 bytes +stdout: 4600 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -65,6 +65,32 @@ AP[3].RATE: 54 Mbit/s AP[3].SIGNAL: 55 AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected index 2fdb18752d..cc659c0377 100644 --- a/clients/tests/test-client.check-on-disk/test_004-036.expected +++ b/clients/tests/test-client.check-on-disk/test_004-036.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:879:test_004()/36 cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3120 bytes +stdout: 4643 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -65,6 +65,32 @@ AP[3].RATE: 54 Mb/s AP[3].SIGNAL: 55 AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 +IP4.ADDRESS[1]: 192.168.228.18/32 +IP4.ADDRESS[2]: 192.168.209.179/25 +IP4.GATEWAY: 192.168.41.120 +IP4.DOMAIN[1]: sear4.foo2.bar +IP4.DOMAIN[2]: sear4.fo.x.y +IP4.DOMAIN[3]: sear4.foo1.bar +IP4.DOMAIN[4]: sear4.foo4.bar +IP4.DOMAIN[5]: sear4.fo.o.bar +IP4.WINS[1]: 192.168.120.79 +DHCP4.OPTION[1]: dhcp-4-opt-0 = val-0 +DHCP4.OPTION[2]: dhcp-4-opt-2 = val-2 +DHCP4.OPTION[3]: dhcp-4-opt-4 = val-4 +DHCP4.OPTION[4]: dhcp-4-opt-7 = val-7 +IP6.GATEWAY: -- +IP6.ROUTE[1]: dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 +IP6.DOMAIN[1]: sear6.foo2.bar +IP6.DOMAIN[2]: sear6.foo1.bar +IP6.DOMAIN[3]: sear6.fo.x.y +IP6.DOMAIN[4]: sear6.fo.o.bar +IP6.DOMAIN[5]: sear6.foo3.bar +IP6.DOMAIN[6]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-2 = val-2 +DHCP6.OPTION[3]: dhcp-6-opt-3 = val-3 +DHCP6.OPTION[4]: dhcp-6-opt-4 = val-4 +DHCP6.OPTION[5]: dhcp-6-opt-5 = val-5 CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{2} CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index cdf8e5743e..9496dea0bd 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -22,6 +22,7 @@ import dbus.mainloop.glib import random import uuid import hashlib +import socket import collections ############################################################################### @@ -46,6 +47,88 @@ class TestError(AssertionError): class Util: + PY3 = (sys.version_info[0] == 3) + + @staticmethod + def addr_family_check(family, allow_af_unspec = False): + if family == socket.AF_INET: + return + if family == socket.AF_INET6: + return + if allow_af_unspec and family == socket.AF_UNSPEC: + return + raise TestError('invalid address family %s' % (family)) + + @staticmethod + def ip_addr_pton(addr, family=None): + if addr is None: + return (None, None) + if family is not None and family is not socket.AF_UNSPEC: + Util.addr_family_check(family) + a = socket.inet_pton(family, addr) + else: + a = None + family = None + try: + a = socket.inet_pton(socket.AF_INET, addr) + family = socket.AF_INET + except: + a = socket.inet_pton(socket.AF_INET6, addr) + family = socket.AF_INET6 + if Util.PY3: + a = tuple([int(c) for c in a]) + else: + a = tuple([ord(c) for c in a]) + return (a, family) + + @staticmethod + def ip_addr_ntop(addr, family = None): + if Util.PY3: + a = bytes(addr) + else: + a = ''.join([chr(c) for c in addr]) + if len(a) == 4: + f = socket.AF_INET + elif len(a) == 16: + f = socket.AF_INET6 + else: + raise TestError("Invalid binary IP address '%s'" % (repr(addr))) + if family is not None and f != family: + raise TestError("Unexpected address family. Expected %s but ip address was %s" % (family, repr(addr))) + return socket.inet_ntop(f, a) + + @staticmethod + def ip_addr_norm(addr, family = None): + a, family = Util.ip_addr_pton(addr, family) + return (Util.ip_addr_ntop(a, family), family) + + @staticmethod + def ip4_addr_ne32(addr): + a, family = Util.ip_addr_pton(addr, socket.AF_INET) + n = 0 + for i in range(4): + n = (n << 8) + a[i] + return socket.htonl(n) + + @staticmethod + def ip6_addr_ay(addr): + return Util.ip_addr_pton(addr, socket.AF_INET6)[0] + + @staticmethod + def ip_net_parse(net, family = None): + parts = net.split('/') + if len(parts) != 2: + raise TestError("Invalid IP network '%s' has not '/' for the prefix length" % (net)) + prefix = int(parts[1]) + addr, family = Util.ip_addr_norm(parts[0], family) + if family == socket.AF_INET: + if prefix < 0 or prefix > 32: + raise TestError("Invalid prefix length for IPv4 address '%s'" % (net)) + else: + if prefix < 0 or prefix > 128: + raise TestError("Invalid prefix length for IPv4 address '%s'" % (net)) + return (addr, prefix, family) + class RandomSeed(): def __init__(self, seed): self.cnt = 0 @@ -152,6 +235,35 @@ class Util: def random_mac(seed): return '%02X:%02X:%02X:%02X:%02X:%02X' % tuple(Util.random_stream(seed, 6)) + @staticmethod + def random_ip(seed, net = None, family = None): + if net is not None: + mask, prefix, family = Util.ip_net_parse(net, family) + a_mask, unused = Util.ip_addr_pton(mask, family) + else: + prefix = None + Util.addr_family_check(family) + if family == socket.AF_INET: + l = 4 + else: + l = 16 + a = tuple(Util.random_stream(seed, l)) + if prefix is not None: + a2 = [] + for i in range(l): + if prefix == 0: + c = a[i] + elif prefix >= 8: + c = a_mask[i] + prefix -= 8 + else: + c = 0xFF & (0xFF << (8 - prefix)) + c = (a[i] & ~c) | (a_mask[i] & c) + prefix = 0 + a2.append(c) + a = tuple(a2) + return (Util.ip_addr_ntop(a, family), family) + @staticmethod def eprint(*args, **kwargs): print(*args, file=sys.stderr, **kwargs) @@ -206,6 +318,7 @@ class Util: ############################################################################### IFACE_DBUS = 'org.freedesktop.DBus' +IFACE_OBJECT_MANAGER = 'org.freedesktop.DBus.ObjectManager' IFACE_CONNECTION = 'org.freedesktop.NetworkManager.Settings.Connection' IFACE_DEVICE = 'org.freedesktop.NetworkManager.Device' IFACE_WIFI = 'org.freedesktop.NetworkManager.Device.Wireless' @@ -222,7 +335,10 @@ IFACE_WIMAX_NSP = 'org.freedesktop.NetworkManager.WiMax.Nsp' IFACE_ACTIVE_CONNECTION = 'org.freedesktop.NetworkManager.Connection.Active' IFACE_VPN_CONNECTION = 'org.freedesktop.NetworkManager.VPN.Connection' IFACE_DNS_MANAGER = 'org.freedesktop.NetworkManager.DnsManager' -IFACE_OBJECT_MANAGER = 'org.freedesktop.DBus.ObjectManager' +IFACE_IP4_CONFIG = 'org.freedesktop.NetworkManager.IP4Config' +IFACE_IP6_CONFIG = 'org.freedesktop.NetworkManager.IP6Config' +IFACE_DHCP4_CONFIG = 'org.freedesktop.NetworkManager.DHCP4Config' +IFACE_DHCP6_CONFIG = 'org.freedesktop.NetworkManager.DHCP6Config' ############################################################################### @@ -577,16 +693,21 @@ class Device(ExportedObj): ExportedObj.__init__(self, ExportedObj.create_path(Device), ident) + self.ip4_config = None + self.ip6_config = None + self.dhcp4_config = None + self.dhcp6_config = None + props = { PRP_DEVICE_UDI: "/sys/devices/virtual/%s" % (iface), PRP_DEVICE_IFACE: iface, PRP_DEVICE_DRIVER: "virtual", PRP_DEVICE_STATE: dbus.UInt32(NM.DeviceState.UNAVAILABLE), PRP_DEVICE_ACTIVE_CONNECTION: ExportedObj.to_path(None), - PRP_DEVICE_IP4_CONFIG: ExportedObj.to_path(None), - PRP_DEVICE_IP6_CONFIG: ExportedObj.to_path(None), - PRP_DEVICE_DHCP4_CONFIG: ExportedObj.to_path(None), - PRP_DEVICE_DHCP6_CONFIG: ExportedObj.to_path(None), + PRP_DEVICE_IP4_CONFIG: ExportedObj.to_path(self.ip4_config), + PRP_DEVICE_IP6_CONFIG: ExportedObj.to_path(self.ip6_config), + PRP_DEVICE_DHCP4_CONFIG: ExportedObj.to_path(self.dhcp4_config), + PRP_DEVICE_DHCP6_CONFIG: ExportedObj.to_path(self.dhcp6_config), PRP_DEVICE_MANAGED: True, PRP_DEVICE_AUTOCONNECT: True, PRP_DEVICE_DEVICE_TYPE: dbus.UInt32(devtype), @@ -595,6 +716,34 @@ class Device(ExportedObj): self.dbus_interface_add(IFACE_DEVICE, props, Device.PropertiesChanged) + def start(self): + self.ip4_config = IP4Config() + self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_IP4_CONFIG, ExportedObj.to_path(self.ip4_config)) + self.ip6_config = IP6Config() + self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_IP6_CONFIG, ExportedObj.to_path(self.ip6_config)) + self.dhcp4_config = Dhcp4Config() + self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_DHCP4_CONFIG, ExportedObj.to_path(self.dhcp4_config)) + self.dhcp6_config = Dhcp6Config() + self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_DHCP6_CONFIG, ExportedObj.to_path(self.dhcp6_config)) + + def stop(self): + self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_IP4_CONFIG, ExportedObj.to_path(None)) + if self.ip4_config is not None: + self.ip4_config.unexport() + self.ip4_config = None + self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_IP6_CONFIG, ExportedObj.to_path(None)) + if self.ip6_config is not None: + self.ip6_config.unexport() + self.ip6_config = None + self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_DHCP4_CONFIG, ExportedObj.to_path(None)) + if self.dhcp4_config is not None: + self.dhcp4_config.unexport() + self.dhcp4_config = None + self._dbus_property_set(IFACE_DEVICE, PRP_DEVICE_DHCP6_CONFIG, ExportedObj.to_path(None)) + if self.dhcp6_config is not None: + self.dhcp6_config.unexport() + self.dhcp6_config = None + @dbus.service.method(dbus_interface=IFACE_DEVICE, in_signature='', out_signature='') def Disconnect(self): pass @@ -1283,9 +1432,11 @@ class NetworkManager(ExportedObj): self._dbus_property_set(IFACE_NM, PRP_NM_DEVICES, ExportedObj.to_path_array(self.devices)) self._dbus_property_set(IFACE_NM, PRP_NM_ALL_DEVICES, ExportedObj.to_path_array(self.devices)) self.DeviceAdded(ExportedObj.to_path(device)) + device.start() return device def remove_device(self, device): + device.stop() self.devices.remove(device) self._dbus_property_set(IFACE_NM, PRP_NM_DEVICES, ExportedObj.to_path_array(self.devices)) self._dbus_property_set(IFACE_NM, PRP_NM_ALL_DEVICES, ExportedObj.to_path_array(self.devices)) @@ -1601,6 +1752,350 @@ class Settings(ExportedObj): ############################################################################### +PRP_IP4_CONFIG_ADDRESSES = 'Addresses' +PRP_IP4_CONFIG_ADDRESSDATA = 'AddressData' +PRP_IP4_CONFIG_GATEWAY = 'Gateway' +PRP_IP4_CONFIG_ROUTES = 'Routes' +PRP_IP4_CONFIG_ROUTEDATA = 'RouteData' +PRP_IP4_CONFIG_NAMESERVERS = 'Nameservers' +PRP_IP4_CONFIG_DOMAINS = 'Domains' +PRP_IP4_CONFIG_SEARCHES = 'Searches' +PRP_IP4_CONFIG_DNSOPTIONS = 'DnsOptions' +PRP_IP4_CONFIG_DNSPRIORITY = 'DnsPriority' +PRP_IP4_CONFIG_WINSSERVERS = 'WinsServers' + +class IP4Config(ExportedObj): + + path_counter_next = 1 + path_prefix = "/org/freedesktop/NetworkManager/IP4Config/" + + def __init__(self, generate_seed = _DEFAULT_ARG): + ExportedObj.__init__(self, ExportedObj.create_path(IP4Config)) + + if generate_seed == _DEFAULT_ARG: + generate_seed = self.path + + props = self._props_generate(generate_seed) + self.dbus_interface_add(IFACE_IP4_CONFIG, props, IP4Config.PropertiesChanged) + self.export() + + def _props_generate(self, generate_seed): + seed = Util.RandomSeed.wrap(generate_seed) + + gateway = None + if seed: + if Util.random_bool(seed): + gateway = Util.random_ip(seed, net = '192.168.0.0/16')[0] + + addrs = [] + if seed: + for n in range(0, Util.random_int(seed, 4)): + a = { + 'addr': Util.random_ip(seed, net = '192.168.0.0/16')[0], + 'prefix': Util.random_int(seed, 17, 32), + 'gateway': gateway if n == 0 else None, + } + addrs.append(a) + + routes = [] + if seed: + for n in range(0, Util.random_int(seed, 4)): + a = { + 'dest': Util.random_ip(seed, net = '192.168.0.0/16')[0], + 'prefix': Util.random_int(seed, 17, 32), + 'next-hop': None if (Util.random_int(seed) % 3 == 0) else Util.random_ip(seed, net = '192.168.0.0/16')[0], + 'metric': -1 if (Util.random_int(seed) % 3 == 0) else Util.random_int(seed, 0, 0xFFFFFFFF), + } + routes.append(a) + + nameservers = [] + if seed: + nameservers = list([Util.random_ip(seed, net = '192.168.0.0/16')[0] for x in range(Util.random_int(seed, 4))]) + + names_selection = ['foo1.bar', 'foo2.bar', 'foo3.bar', 'foo4.bar', 'fo.o.bar', 'fo.x.y']; + + domains = [] + if seed: + domains = Util.random_subset(seed, ['dom4.' + s for s in names_selection]) + + searches = [] + if seed: + domains = Util.random_subset(seed, ['sear4.' + s for s in names_selection]) + + dnsoptions = [] + if seed: + dnsoptions = Util.random_subset(seed, ['dns4-opt1', 'dns4-opt2', 'dns4-opt3', 'dns4-opt4']) + + dnspriority = 0 + if seed: + dnspriority = Util.random_int(seed, -10000, 10000) + + winsservers = [] + if seed: + winsservers = list([Util.random_ip(seed, net = '192.168.0.0/16')[0] for x in range(Util.random_int(seed, 4))]) + + return { + PRP_IP4_CONFIG_ADDRESSES: dbus.Array([ + [ Util.ip4_addr_ne32(a['addr']), + a['prefix'], + Util.ip4_addr_ne32(a['gateway']) if a['gateway'] else 0 + ] for a in addrs + ], + 'au'), + PRP_IP4_CONFIG_ADDRESSDATA: dbus.Array([ + dbus.Dictionary(collections.OrderedDict( [ ('address', dbus.String(a['addr'])), + ('prefix', dbus.UInt32(a['prefix']))] + \ + ([ ('gateway', dbus.String(a['gateway'])) ] if a['gateway'] else [])), + 'sv') + for a in addrs + ], + 'a{sv}'), + PRP_IP4_CONFIG_GATEWAY: dbus.String(gateway) if gateway else "", + PRP_IP4_CONFIG_ROUTES: dbus.Array([ + [ Util.ip4_addr_ne32(a['dest']), + a['prefix'], + Util.ip4_addr_ne32(a['next-hop'] or '0.0.0.0'), + max(a['metric'], 0) + ] for a in routes + ], + 'au'), + PRP_IP4_CONFIG_ROUTEDATA: dbus.Array([ + dbus.Dictionary(collections.OrderedDict( [ ('dest', dbus.String(a['dest'])), + ('prefix', dbus.UInt32(a['prefix']))] + \ + ([ ('next-hop', dbus.String(a['next-hop'])) ] if a['next-hop'] else []) + \ + ([ ('metric', dbus.UInt32(a['metric'])) ] if a['metric'] != -1 else [])), + 'sv') + for a in routes + ], + 'a{sv}'), + PRP_IP4_CONFIG_NAMESERVERS: dbus.Array([dbus.UInt32(Util.ip4_addr_ne32(n)) for n in nameservers], 'u'), + PRP_IP4_CONFIG_DOMAINS: dbus.Array(domains, 's'), + PRP_IP4_CONFIG_SEARCHES: dbus.Array(searches, 's'), + PRP_IP4_CONFIG_DNSOPTIONS: dbus.Array(dnsoptions, 's'), + PRP_IP4_CONFIG_DNSPRIORITY: dbus.Int32(dnspriority), + PRP_IP4_CONFIG_WINSSERVERS: dbus.Array([dbus.UInt32(Util.ip4_addr_ne32(n)) for n in winsservers], 'u'), + } + + def props_regenerate(self, generate_seed): + props = self.generate_props(generate_seed) + for k,v in props.items(): + self._dbus_property_set(IFACE_IP4_CONFIG, k, v) + + @dbus.service.signal(IFACE_IP4_CONFIG, signature='a{sv}') + def PropertiesChanged(self, path): + pass + +############################################################################### + +PRP_IP6_CONFIG_ADDRESSES = "Addresses" +PRP_IP6_CONFIG_ADDRESSDATA = "AddressData" +PRP_IP6_CONFIG_GATEWAY = "Gateway" +PRP_IP6_CONFIG_ROUTES = "Routes" +PRP_IP6_CONFIG_ROUTEDATA = "RouteData" +PRP_IP6_CONFIG_NAMESERVERS = "Nameservers" +PRP_IP6_CONFIG_DOMAINS = "Domains" +PRP_IP6_CONFIG_SEARCHES = "Searches" +PRP_IP6_CONFIG_DNSOPTIONS = "DnsOptions" +PRP_IP6_CONFIG_DNSPRIORITY = "DnsPriority" + +class IP6Config(ExportedObj): + + path_counter_next = 1 + path_prefix = "/org/freedesktop/NetworkManager/IP6Config/" + + def __init__(self, generate_seed = _DEFAULT_ARG): + ExportedObj.__init__(self, ExportedObj.create_path(IP6Config)) + + if generate_seed == _DEFAULT_ARG: + generate_seed = self.path + + props = self._props_generate(generate_seed) + self.dbus_interface_add(IFACE_IP6_CONFIG, props, IP6Config.PropertiesChanged) + self.export() + + def _props_generate(self, generate_seed): + seed = Util.RandomSeed.wrap(generate_seed) + + gateway = None + if seed: + if Util.random_bool(seed): + gateway = Util.random_ip(seed, net = '2001:a::/64')[0] + + addrs = [] + if seed: + for n in range(0, Util.random_int(seed, 4)): + a = { + 'addr': Util.random_ip(seed, net = '2001:a::/64')[0], + 'prefix': Util.random_int(seed, 65, 128), + 'gateway': gateway if n == 0 else None, + } + addrs.append(a) + + routes = [] + if seed: + for n in range(0, Util.random_int(seed, 4)): + a = { + 'dest': Util.random_ip(seed, net = '2001:a::/64')[0], + 'prefix': Util.random_int(seed, 65, 128), + 'next-hop': None if (Util.random_int(seed) % 3 == 0) else Util.random_ip(seed, net = '2001:a::/64')[0], + 'metric': -1 if (Util.random_int(seed) % 3 == 0) else Util.random_int(seed, 0, 0xFFFFFFFF), + } + routes.append(a) + + nameservers = [] + if seed: + nameservers = list([Util.random_ip(seed, net = '2001:a::/64')[0] for x in range(Util.random_int(seed, 4))]) + + names_selection = ['foo1.bar', 'foo2.bar', 'foo3.bar', 'foo4.bar', 'fo.o.bar', 'fo.x.y']; + + domains = [] + if seed: + domains = Util.random_subset(seed, ['dom6.' + s for s in names_selection]) + + searches = [] + if seed: + domains = Util.random_subset(seed, ['sear6.' + s for s in names_selection]) + + dnsoptions = [] + if seed: + dnsoptions = Util.random_subset(seed, ['dns6-opt1', 'dns6-opt2', 'dns6-opt3', 'dns6-opt4']) + + dnspriority = 0 + if seed: + dnspriority = Util.random_int(seed, -10000, 10000) + + return { + PRP_IP6_CONFIG_ADDRESSES: dbus.Array([ + [ Util.ip6_addr_ay(a['addr']), + a['prefix'], + Util.ip6_addr_ay(a['gateway'] or '::') + ] for a in addrs + ], + '(ayuay)'), + PRP_IP6_CONFIG_ADDRESSDATA: dbus.Array([ + dbus.Dictionary(collections.OrderedDict( [ ('address', dbus.String(a['addr'])), + ('prefix', dbus.UInt32(a['prefix']))] + \ + ([ ('gateway', dbus.String(a['gateway'])) ] if a['gateway'] else [])), + 'sv') + for a in addrs + ], + 'a{sv}'), + PRP_IP6_CONFIG_GATEWAY: dbus.String(gateway) if gateway else "", + PRP_IP6_CONFIG_ROUTES: dbus.Array([ + [ Util.ip6_addr_ay(a['dest']), + a['prefix'], + Util.ip6_addr_ay(a['next-hop'] or '::'), + max(a['metric'], 0) + ] for a in routes + ], + '(ayuayu)'), + PRP_IP6_CONFIG_ROUTEDATA: dbus.Array([ + dbus.Dictionary(collections.OrderedDict( [ ('dest', dbus.String(a['dest'])), + ('prefix', dbus.UInt32(a['prefix']))] + \ + ([ ('next-hop', dbus.String(a['next-hop'])) ] if a['next-hop'] else []) + \ + ([ ('metric', dbus.UInt32(a['metric'])) ] if a['metric'] != -1 else [])), + 'sv') + for a in routes + ], + 'a{sv}'), + PRP_IP6_CONFIG_NAMESERVERS: dbus.Array([Util.ip6_addr_ay(n) for n in nameservers], 'ay'), + PRP_IP6_CONFIG_DOMAINS: dbus.Array(domains, 's'), + PRP_IP6_CONFIG_SEARCHES: dbus.Array(searches, 's'), + PRP_IP6_CONFIG_DNSOPTIONS: dbus.Array(dnsoptions, 's'), + PRP_IP6_CONFIG_DNSPRIORITY: dbus.Int32(dnspriority), + } + + def props_regenerate(self, generate_seed): + props = self.generate_props(generate_seed) + for k,v in props.items(): + self._dbus_property_set(IFACE_IP6_CONFIG, k, v) + + @dbus.service.signal(IFACE_IP6_CONFIG, signature='a{sv}') + def PropertiesChanged(self, path): + pass + +############################################################################### + +PRP_DHCP4_CONFIG_OPTIONS = 'Options' + +class Dhcp4Config(ExportedObj): + + path_counter_next = 1 + path_prefix = "/org/freedesktop/NetworkManager/DHCP4Config/" + + def __init__(self, generate_seed = _DEFAULT_ARG): + ExportedObj.__init__(self, ExportedObj.create_path(Dhcp4Config)) + + if generate_seed == _DEFAULT_ARG: + generate_seed = self.path + + props = self._props_generate(generate_seed) + self.dbus_interface_add(IFACE_DHCP4_CONFIG, props, Dhcp4Config.PropertiesChanged) + self.export() + + def _props_generate(self, generate_seed): + seed = Util.RandomSeed.wrap(generate_seed) + + options = [] + if seed: + options = Util.random_subset(seed, [('dhcp-4-opt-' + str(i), 'val-' + str(i)) for i in range(10)]) + + return { + PRP_DHCP4_CONFIG_OPTIONS: dbus.Dictionary(collections.OrderedDict(options), + 'sv') + } + + def props_regenerate(self, generate_seed): + props = self.generate_props(generate_seed) + for k,v in props.items(): + self._dbus_property_set(IFACE_DHCP4_CONFIG, k, v) + + @dbus.service.signal(IFACE_DHCP4_CONFIG, signature='a{sv}') + def PropertiesChanged(self, path): + pass + +############################################################################### + +PRP_DHCP6_CONFIG_OPTIONS = 'Options' + +class Dhcp6Config(ExportedObj): + + path_counter_next = 1 + path_prefix = "/org/freedesktop/NetworkManager/DHCP6Config/" + + def __init__(self, generate_seed = _DEFAULT_ARG): + ExportedObj.__init__(self, ExportedObj.create_path(Dhcp6Config)) + + if generate_seed == _DEFAULT_ARG: + generate_seed = self.path + + props = self._props_generate(generate_seed) + self.dbus_interface_add(IFACE_DHCP6_CONFIG, props, Dhcp6Config.PropertiesChanged) + self.export() + + def _props_generate(self, generate_seed): + seed = Util.RandomSeed.wrap(generate_seed) + + options = [] + if seed: + options = Util.random_subset(seed, [('dhcp-6-opt-' + str(i), 'val-' + str(i)) for i in range(10)]) + + return { + PRP_DHCP4_CONFIG_OPTIONS: dbus.Dictionary(collections.OrderedDict(options), + 'sv') + } + + def props_regenerate(self, generate_seed): + props = self.generate_props(generate_seed) + for k,v in props.items(): + self._dbus_property_set(IFACE_DHCP6_CONFIG, k, v) + + @dbus.service.signal(IFACE_DHCP6_CONFIG, signature='a{sv}') + def PropertiesChanged(self, path): + pass + +############################################################################### + PRP_DNS_MANAGER_MODE = 'Mode' PRP_DNS_MANAGER_RC_MANAGER = 'RcManager' PRP_DNS_MANAGER_CONFIGURATION = 'Configuration' From d32ad46a62e369587acf3b1f57e3ed006647f6c6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 8 Jun 2018 08:50:03 +0200 Subject: [PATCH 7/8] clients/tests: add more tests for nmcli showing connections and devices --- .../test-client.check-on-disk/Makefile.am | 6 +++ .../test_004-037.expected | 46 +++++++++++++++++++ .../test_004-038.expected | 46 +++++++++++++++++++ .../test_004-039.expected | 46 +++++++++++++++++++ .../test_004-040.expected | 46 +++++++++++++++++++ .../test_004-041.expected | 18 ++++++++ .../test_004-042.expected | 18 ++++++++ clients/tests/test-client.py | 9 ++++ 8 files changed, 235 insertions(+) create mode 100644 clients/tests/test-client.check-on-disk/test_004-037.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-038.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-039.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-040.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-041.expected create mode 100644 clients/tests/test-client.check-on-disk/test_004-042.expected diff --git a/clients/tests/test-client.check-on-disk/Makefile.am b/clients/tests/test-client.check-on-disk/Makefile.am index e36654bc8d..cabcb265a3 100644 --- a/clients/tests/test-client.check-on-disk/Makefile.am +++ b/clients/tests/test-client.check-on-disk/Makefile.am @@ -179,4 +179,10 @@ clients_tests_expected_files = \ clients/tests/test-client.check-on-disk/test_004-034.expected \ clients/tests/test-client.check-on-disk/test_004-035.expected \ clients/tests/test-client.check-on-disk/test_004-036.expected \ + clients/tests/test-client.check-on-disk/test_004-037.expected \ + clients/tests/test-client.check-on-disk/test_004-038.expected \ + clients/tests/test-client.check-on-disk/test_004-039.expected \ + clients/tests/test-client.check-on-disk/test_004-040.expected \ + clients/tests/test-client.check-on-disk/test_004-041.expected \ + clients/tests/test-client.check-on-disk/test_004-042.expected \ $(NULL) diff --git a/clients/tests/test-client.check-on-disk/test_004-037.expected b/clients/tests/test-client.check-on-disk/test_004-037.expected new file mode 100644 index 0000000000..629a9b8254 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-037.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:882:test_004()/37 +cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 +lang: C +returncode: 0 +stdout: 1679 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: unknown +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +WIFI-PROPERTIES.WEP: yes +WIFI-PROPERTIES.WPA: yes +WIFI-PROPERTIES.WPA2: yes +WIFI-PROPERTIES.TKIP: yes +WIFI-PROPERTIES.CCMP: yes +WIFI-PROPERTIES.AP: yes +WIFI-PROPERTIES.ADHOC: yes +WIFI-PROPERTIES.2GHZ: unknown +WIFI-PROPERTIES.5GHZ: unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-038.expected b/clients/tests/test-client.check-on-disk/test_004-038.expected new file mode 100644 index 0000000000..0d3386a330 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-038.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:882:test_004()/38 +cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1691 bytes +>>> +GENERAL.DEVICE: wlan0 +GENERAL.TYPE: wifi +GENERAL.NM-TYPE: NMDeviceWifi +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: con-vpn-1 +GENERAL.CON-UUID: UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED: nieznane +GENERAL.HWADDR: 13:E0:74:85:7C:D9 +WIFI-PROPERTIES.WEP: tak +WIFI-PROPERTIES.WPA: tak +WIFI-PROPERTIES.WPA2: tak +WIFI-PROPERTIES.TKIP: tak +WIFI-PROPERTIES.CCMP: tak +WIFI-PROPERTIES.AP: tak +WIFI-PROPERTIES.ADHOC: tak +WIFI-PROPERTIES.2GHZ: nieznane +WIFI-PROPERTIES.5GHZ: nieznane + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-039.expected b/clients/tests/test-client.check-on-disk/test_004-039.expected new file mode 100644 index 0000000000..612a041ef7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-039.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:885:test_004()/39 +cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 +lang: C +returncode: 0 +stdout: 931 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no +GENERAL.PHYS-PORT-ID: +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:unknown +GENERAL.HWADDR:13:E0:74:85:7C:D9 +WIFI-PROPERTIES.WEP:yes +WIFI-PROPERTIES.WPA:yes +WIFI-PROPERTIES.WPA2:yes +WIFI-PROPERTIES.TKIP:yes +WIFI-PROPERTIES.CCMP:yes +WIFI-PROPERTIES.AP:yes +WIFI-PROPERTIES.ADHOC:yes +WIFI-PROPERTIES.2GHZ:unknown +WIFI-PROPERTIES.5GHZ:unknown + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected new file mode 100644 index 0000000000..ffe73a0f9d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-040.expected @@ -0,0 +1,46 @@ +location: clients/tests/test-client.py:885:test_004()/40 +cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 943 bytes +>>> +GENERAL.DEVICE:wlan0 +GENERAL.TYPE:wifi +GENERAL.NM-TYPE:NMDeviceWifi +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:13:E0:74:85:7C:D9 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.UDI:/sys/devices/virtual/wlan0 +GENERAL.IP-IFACE: +GENERAL.IS-SOFTWARE:nie +GENERAL.NM-MANAGED:tak +GENERAL.AUTOCONNECT:tak +GENERAL.FIRMWARE-MISSING:nie +GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.PHYS-PORT-ID: +GENERAL.CONNECTION:con-vpn-1 +GENERAL.CON-UUID:UUID-con-vpn-1-REPLACED-REPLACED-REP +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.METERED:nieznane +GENERAL.HWADDR:13:E0:74:85:7C:D9 +WIFI-PROPERTIES.WEP:tak +WIFI-PROPERTIES.WPA:tak +WIFI-PROPERTIES.WPA2:tak +WIFI-PROPERTIES.TKIP:tak +WIFI-PROPERTIES.CCMP:tak +WIFI-PROPERTIES.AP:tak +WIFI-PROPERTIES.ADHOC:tak +WIFI-PROPERTIES.2GHZ:nieznane +WIFI-PROPERTIES.5GHZ:nieznane + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-041.expected b/clients/tests/test-client.check-on-disk/test_004-041.expected new file mode 100644 index 0000000000..c50258737d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-041.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:888:test_004()/41 +cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev +lang: C +returncode: 0 +stdout: 366 bytes +>>> +DEVICE TYPE DBUS-PATH +eth0 ethernet /org/freedesktop/NetworkManager/Devices/1 +eth1 ethernet /org/freedesktop/NetworkManager/Devices/2 +wlan1 wifi /org/freedesktop/NetworkManager/Devices/4 +wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 +wlan0 wifi /org/freedesktop/NetworkManager/Devices/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-042.expected b/clients/tests/test-client.check-on-disk/test_004-042.expected new file mode 100644 index 0000000000..c836b2a837 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_004-042.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:888:test_004()/42 +cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 366 bytes +>>> +DEVICE TYPE DBUS-PATH +eth0 ethernet /org/freedesktop/NetworkManager/Devices/1 +eth1 ethernet /org/freedesktop/NetworkManager/Devices/2 +wlan1 wifi /org/freedesktop/NetworkManager/Devices/4 +wlan1 wifi /org/freedesktop/NetworkManager/Devices/5 +wlan0 wifi /org/freedesktop/NetworkManager/Devices/3 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 2d4a1803d9..ec1443dc66 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -878,6 +878,15 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['-f', 'all', 'dev', 'show', 'wlan0'], replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', 'dev', 'show', 'wlan0'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', '-t', 'dev', 'show', 'wlan0'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'DEVICE,TYPE,DBUS-PATH', 'dev'], + replace_stdout = replace_stdout) + ############################################################################### def main(): From 1403ebf43562f38da896a627a3ed306adefea2df Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 8 Jun 2018 08:50:03 +0200 Subject: [PATCH 8/8] clients/tests: show device fields with invisible connection How does `nmcli -f ALL dev show $DEV` look, if it references a connection that is invisible to the user? Note in the output: CONNECTIONS.AVAILABLE-CONNECTIONS[1]: (null) | (null) --- .../test-client.check-on-disk/Makefile.am | 8 ++ .../test_003-032.expected | 62 ++++++++- .../test_003-033.expected | 68 ++++++++-- .../test_003-034.expected | 14 +-- .../test_003-035.expected | 16 +-- .../test_003-036.expected | 16 +-- .../test_003-037.expected | 8 +- .../test_003-038.expected | 8 +- .../test_003-039.expected | 12 +- .../test_003-040.expected | 12 +- .../test_003-041.expected | 11 +- .../test_003-042.expected | 11 +- .../test_003-043.expected | 87 +------------ .../test_003-044.expected | 87 +------------ .../test_003-045.expected | 88 ++++++++++++- .../test_003-046.expected | 88 ++++++++++++- .../test_003-047.expected | 107 +--------------- .../test_003-048.expected | 107 +--------------- .../test_003-049.expected | 119 ++++++++++++++++-- .../test_003-050.expected | 119 ++++++++++++++++-- .../test_003-051.expected | 70 ++--------- .../test_003-052.expected | 70 ++--------- .../test_003-053.expected | 66 ++++++++-- .../test_003-054.expected | 66 ++++++++-- .../test_003-055.expected | 65 ++++++++-- .../test_003-056.expected | 65 ++++++++-- .../test_003-057.expected | 17 ++- .../test_003-058.expected | 17 ++- .../test_003-059.expected | 16 ++- .../test_003-060.expected | 16 ++- .../test_003-061.expected | 12 +- .../test_003-062.expected | 12 +- .../test_003-063.expected | 16 +-- .../test_003-064.expected | 16 +-- .../test_003-065.expected | 21 +++- .../test_003-066.expected | 21 +++- .../test_003-067.expected | 10 +- .../test_003-068.expected | 10 +- .../test_003-069.expected | 113 +---------------- .../test_003-070.expected | 113 +---------------- .../test_003-071.expected | 105 ++-------------- .../test_003-072.expected | 105 ++-------------- .../test_003-073.expected | 115 +++++++++++++++-- .../test_003-074.expected | 115 +++++++++++++++-- .../test_003-075.expected | 100 ++++++++++++++- .../test_003-076.expected | 100 ++++++++++++++- .../test_003-077.expected | 65 ++++++++-- .../test_003-078.expected | 65 ++++++++-- .../test_003-079.expected | 15 +-- .../test_003-080.expected | 15 +-- .../test_003-081.expected | 18 +-- .../test_003-082.expected | 18 +-- .../test_003-083.expected | 13 +- .../test_003-084.expected | 13 +- .../test_003-085.expected | 12 +- .../test_003-086.expected | 12 +- .../test_003-087.expected | 22 ++-- .../test_003-088.expected | 22 ++-- .../test_003-089.expected | 20 +-- .../test_003-090.expected | 20 +-- .../test_003-091.expected | 20 +-- .../test_003-092.expected | 20 +-- .../test_003-093.expected | 19 +++ .../test_003-094.expected | 19 +++ .../test_003-095.expected | 13 ++ .../test_003-096.expected | 13 ++ .../test_003-097.expected | 24 ++++ .../test_003-098.expected | 24 ++++ .../test_003-099.expected | 67 ++++++++++ .../test_003-100.expected | 67 ++++++++++ .../test_004-001.expected | 2 +- .../test_004-002.expected | 2 +- .../test_004-003.expected | 2 +- .../test_004-004.expected | 2 +- .../test_004-005.expected | 2 +- .../test_004-006.expected | 2 +- .../test_004-007.expected | 2 +- .../test_004-008.expected | 2 +- .../test_004-009.expected | 2 +- .../test_004-010.expected | 2 +- .../test_004-011.expected | 2 +- .../test_004-012.expected | 2 +- .../test_004-013.expected | 2 +- .../test_004-014.expected | 2 +- .../test_004-015.expected | 2 +- .../test_004-016.expected | 2 +- .../test_004-017.expected | 2 +- .../test_004-018.expected | 2 +- .../test_004-019.expected | 2 +- .../test_004-020.expected | 2 +- .../test_004-021.expected | 2 +- .../test_004-022.expected | 2 +- .../test_004-023.expected | 2 +- .../test_004-024.expected | 2 +- .../test_004-025.expected | 2 +- .../test_004-026.expected | 2 +- .../test_004-027.expected | 2 +- .../test_004-028.expected | 2 +- .../test_004-029.expected | 2 +- .../test_004-030.expected | 2 +- .../test_004-031.expected | 2 +- .../test_004-032.expected | 2 +- .../test_004-033.expected | 2 +- .../test_004-034.expected | 2 +- .../test_004-035.expected | 2 +- .../test_004-036.expected | 2 +- .../test_004-037.expected | 2 +- .../test_004-038.expected | 2 +- .../test_004-039.expected | 2 +- .../test_004-040.expected | 2 +- .../test_004-041.expected | 2 +- .../test_004-042.expected | 2 +- clients/tests/test-client.py | 6 + 113 files changed, 1878 insertions(+), 1328 deletions(-) create mode 100644 clients/tests/test-client.check-on-disk/test_003-093.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-094.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-095.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-096.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-097.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-098.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-099.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-100.expected diff --git a/clients/tests/test-client.check-on-disk/Makefile.am b/clients/tests/test-client.check-on-disk/Makefile.am index cabcb265a3..80ffd5a34e 100644 --- a/clients/tests/test-client.check-on-disk/Makefile.am +++ b/clients/tests/test-client.check-on-disk/Makefile.am @@ -143,6 +143,14 @@ clients_tests_expected_files = \ clients/tests/test-client.check-on-disk/test_003-090.expected \ clients/tests/test-client.check-on-disk/test_003-091.expected \ clients/tests/test-client.check-on-disk/test_003-092.expected \ + clients/tests/test-client.check-on-disk/test_003-093.expected \ + clients/tests/test-client.check-on-disk/test_003-094.expected \ + clients/tests/test-client.check-on-disk/test_003-095.expected \ + clients/tests/test-client.check-on-disk/test_003-096.expected \ + clients/tests/test-client.check-on-disk/test_003-097.expected \ + clients/tests/test-client.check-on-disk/test_003-098.expected \ + clients/tests/test-client.check-on-disk/test_003-099.expected \ + clients/tests/test-client.check-on-disk/test_003-100.expected \ clients/tests/test-client.check-on-disk/test_004-001.expected \ clients/tests/test-client.check-on-disk/test_004-002.expected \ clients/tests/test-client.check-on-disk/test_004-003.expected \ diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected index b5d45b992d..33259a7343 100644 --- a/clients/tests/test-client.check-on-disk/test_003-032.expected +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -1,10 +1,64 @@ -location: clients/tests/test-client.py:738:test_003()/32 -cmd: $NMCLI con up ethernet ifname eth1 +location: clients/tests/test-client.py:771:test_003()/32 +cmd: $NMCLI -f ALL -t dev show eth0 lang: C returncode: 0 -stdout: 106 bytes +stdout: 2011 bytes >>> -Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2) +GENERAL.DEVICE:eth0 +GENERAL.TYPE:ethernet +GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:C0:61:AE:26:4D:D7 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/eth0 +GENERAL.IP-IFACE: +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no +GENERAL.PHYS-PORT-ID: +GENERAL.CONNECTION:ethernet +GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED:unknown +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no +WIRED-PROPERTIES.CARRIER:off +IP4.ADDRESS[1]:192.168.6.238/29 +IP4.GATEWAY: +IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]:192.168.213.113 +IP4.DOMAIN[1]:sear4.foo4.bar +IP4.WINS[1]:192.168.156.115 +IP4.WINS[2]:192.168.8.33 +IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]:sear6.fo.x.y +IP6.DOMAIN[2]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected index b750b22c8b..1bf930863b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-033.expected +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -1,14 +1,64 @@ -location: clients/tests/test-client.py:741:test_003()/33 -cmd: $NMCLI con -lang: C +location: clients/tests/test-client.py:771:test_003()/33 +cmd: $NMCLI -f ALL -t dev show eth0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 330 bytes +stdout: 2034 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +GENERAL.DEVICE:eth0 +GENERAL.TYPE:ethernet +GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:C0:61:AE:26:4D:D7 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.UDI:/sys/devices/virtual/eth0 +GENERAL.IP-IFACE: +GENERAL.IS-SOFTWARE:nie +GENERAL.NM-MANAGED:tak +GENERAL.AUTOCONNECT:tak +GENERAL.FIRMWARE-MISSING:nie +GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.PHYS-PORT-ID: +GENERAL.CONNECTION:ethernet +GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED:nieznane +CAPABILITIES.CARRIER-DETECT:nie +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:nie +CAPABILITIES.SRIOV:nie +WIRED-PROPERTIES.CARRIER:wyłączone +IP4.ADDRESS[1]:192.168.6.238/29 +IP4.GATEWAY: +IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]:192.168.213.113 +IP4.DOMAIN[1]:sear4.foo4.bar +IP4.WINS[1]:192.168.156.115 +IP4.WINS[2]:192.168.8.33 +IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]:sear6.fo.x.y +IP6.DOMAIN[2]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected index b7c4f5d2ea..c1b60b0e74 100644 --- a/clients/tests/test-client.check-on-disk/test_003-034.expected +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -1,14 +1,10 @@ -location: clients/tests/test-client.py:741:test_003()/34 -cmd: $NMCLI con -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:738:test_003()/34 +cmd: $NMCLI con up ethernet ifname eth1 +lang: C returncode: 0 -stdout: 330 bytes +stdout: 106 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2) <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected index d1055ffa5d..c1912b36f6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-035.expected +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -1,14 +1,14 @@ -location: clients/tests/test-client.py:744:test_003()/35 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:741:test_003()/35 +cmd: $NMCLI con lang: C returncode: 0 -stdout: 1355 bytes +stdout: 330 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected index f58f4a58c9..c045d16c64 100644 --- a/clients/tests/test-client.check-on-disk/test_003-036.expected +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -1,14 +1,14 @@ -location: clients/tests/test-client.py:744:test_003()/36 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:741:test_003()/36 +cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 -stdout: 1360 bytes +stdout: 330 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth1 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected index 7eb974a6d4..db933ad07d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-037.expected +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -1,12 +1,14 @@ -location: clients/tests/test-client.py:747:test_003()/37 -cmd: $NMCLI -f ALL con s -a +location: clients/tests/test-client.py:744:test_003()/37 +cmd: $NMCLI -f ALL con lang: C returncode: 0 -stdout: 813 bytes +stdout: 1355 bytes >>> NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected index 5a09266ab6..67e0da301b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-038.expected +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -1,12 +1,14 @@ -location: clients/tests/test-client.py:747:test_003()/38 -cmd: $NMCLI -f ALL con s -a +location: clients/tests/test-client.py:744:test_003()/38 +cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 -stdout: 816 bytes +stdout: 1360 bytes >>> NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected index 9a1f217372..638a81d280 100644 --- a/clients/tests/test-client.check-on-disk/test_003-039.expected +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -1,12 +1,12 @@ -location: clients/tests/test-client.py:750:test_003()/39 -cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act +location: clients/tests/test-client.py:747:test_003()/39 +cmd: $NMCLI -f ALL con s -a lang: C returncode: 0 -stdout: 294 bytes +stdout: 813 bytes >>> -ACTIVE-PATH DEVICE UUID -/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL -/org/freedesktop/NetworkManager/ActiveConnection/2 eth1 UUID-ethernet-REPLACED-REPLACED-REPL +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected index 37ebd08c83..f17c04678c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-040.expected +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -1,12 +1,12 @@ -location: clients/tests/test-client.py:750:test_003()/40 -cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act +location: clients/tests/test-client.py:747:test_003()/40 +cmd: $NMCLI -f ALL con s -a lang: pl_PL.UTF-8 returncode: 0 -stdout: 294 bytes +stdout: 816 bytes >>> -ACTIVE-PATH DEVICE UUID -/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL -/org/freedesktop/NetworkManager/ActiveConnection/2 eth1 UUID-ethernet-REPLACED-REPLACED-REPL +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected index 10efe56489..072535414a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-041.expected +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -1,11 +1,12 @@ -location: clients/tests/test-client.py:753:test_003()/41 -cmd: $NMCLI -f UUID,NAME con s --active +location: clients/tests/test-client.py:750:test_003()/41 +cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: C returncode: 0 -stdout: 96 bytes +stdout: 294 bytes >>> -UUID NAME -UUID-ethernet-REPLACED-REPLACED-REPL ethernet +ACTIVE-PATH DEVICE UUID +/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL +/org/freedesktop/NetworkManager/ActiveConnection/2 eth1 UUID-ethernet-REPLACED-REPLACED-REPL <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected index 13d86a0f39..23a691ca36 100644 --- a/clients/tests/test-client.check-on-disk/test_003-042.expected +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -1,11 +1,12 @@ -location: clients/tests/test-client.py:753:test_003()/42 -cmd: $NMCLI -f UUID,NAME con s --active +location: clients/tests/test-client.py:750:test_003()/42 +cmd: $NMCLI -f ACTIVE-PATH,DEVICE,UUID con s -act lang: pl_PL.UTF-8 returncode: 0 -stdout: 96 bytes +stdout: 294 bytes >>> -UUID NAME -UUID-ethernet-REPLACED-REPLACED-REPL ethernet +ACTIVE-PATH DEVICE UUID +/org/freedesktop/NetworkManager/ActiveConnection/1 eth0 UUID-ethernet-REPLACED-REPLACED-REPL +/org/freedesktop/NetworkManager/ActiveConnection/2 eth1 UUID-ethernet-REPLACED-REPLACED-REPL <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected index 80174c9b90..ad0bab0dd0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-043.expected +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -1,88 +1,11 @@ -location: clients/tests/test-client.py:756:test_003()/43 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:753:test_003()/43 +cmd: $NMCLI -f UUID,NAME con s --active lang: C returncode: 0 -stdout: 3559 bytes +stdout: 96 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- +UUID NAME +UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected index 53bbce993c..0efb6cda02 100644 --- a/clients/tests/test-client.check-on-disk/test_003-044.expected +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -1,88 +1,11 @@ -location: clients/tests/test-client.py:756:test_003()/44 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:753:test_003()/44 +cmd: $NMCLI -f UUID,NAME con s --active lang: pl_PL.UTF-8 returncode: 0 -stdout: 3577 bytes +stdout: 96 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- +UUID NAME +UUID-ethernet-REPLACED-REPLACED-REPL ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected index 235ff6e2bd..2bb2614a67 100644 --- a/clients/tests/test-client.check-on-disk/test_003-045.expected +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -1,12 +1,88 @@ -location: clients/tests/test-client.py:759:test_003()/45 -cmd: $NMCLI -f GENERAL.STATE con s ethernet +location: clients/tests/test-client.py:756:test_003()/45 +cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 101 bytes +stdout: 3559 bytes >>> -GENERAL.STATE: activated - -GENERAL.STATE: activated +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected index 6d803057e4..e1248872d1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-046.expected +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -1,12 +1,88 @@ -location: clients/tests/test-client.py:759:test_003()/46 -cmd: $NMCLI -f GENERAL.STATE con s ethernet +location: clients/tests/test-client.py:756:test_003()/46 +cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 103 bytes +stdout: 3577 bytes >>> -GENERAL.STATE: aktywowano - -GENERAL.STATE: aktywowano +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected index c69543069d..7a2b7ccd8a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-047.expected +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -1,113 +1,12 @@ -location: clients/tests/test-client.py:762:test_003()/47 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:759:test_003()/47 +cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: C returncode: 0 -stdout: 4888 bytes +stdout: 101 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected index 25a0f7babd..f8b4a42827 100644 --- a/clients/tests/test-client.check-on-disk/test_003-048.expected +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -1,113 +1,12 @@ -location: clients/tests/test-client.py:762:test_003()/48 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:759:test_003()/48 +cmd: $NMCLI -f GENERAL.STATE con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 4914 bytes +stdout: 103 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 GENERAL.STATE: aktywowano -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 GENERAL.STATE: aktywowano -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected index 1b8a855ade..69a07f30d5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-049.expected +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -1,19 +1,116 @@ -location: clients/tests/test-client.py:765:test_003()/49 -cmd: $NMCLI -f ALL dev s eth0 +location: clients/tests/test-client.py:762:test_003()/49 +cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 1056 bytes +stdout: 4888 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 -eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected index c2b2628d61..8f97ceb87e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-050.expected +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -1,19 +1,116 @@ -location: clients/tests/test-client.py:765:test_003()/50 -cmd: $NMCLI -f ALL dev s eth0 +location: clients/tests/test-client.py:762:test_003()/50 +cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 1061 bytes +stdout: 4914 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 -eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected index 55d542bd5a..b206c2f1e4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -1,67 +1,19 @@ -location: clients/tests/test-client.py:768:test_003()/51 -cmd: $NMCLI -f ALL dev show eth0 +location: clients/tests/test-client.py:765:test_003()/51 +cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 -stdout: 3239 bytes +stdout: 1056 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: C0:61:AE:26:4D:D7 -GENERAL.MTU: 0 -GENERAL.STATE: 20 (unavailable) -GENERAL.REASON: 0 (No reason given) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: no -GENERAL.NM-MANAGED: yes -GENERAL.AUTOCONNECT: yes -GENERAL.FIRMWARE-MISSING: no -GENERAL.NM-PLUGIN-MISSING: no -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unknown -CAPABILITIES.CARRIER-DETECT: no -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: no -CAPABILITIES.SRIOV: no -WIRED-PROPERTIES.CARRIER: off -IP4.ADDRESS[1]: 192.168.6.238/29 -IP4.GATEWAY: -- -IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 -IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 -IP4.DNS[1]: 192.168.213.113 -IP4.DOMAIN[1]: sear4.foo4.bar -IP4.WINS[1]: 192.168.156.115 -IP4.WINS[2]: 192.168.8.33 -IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 -IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 -IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 -IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 -IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 -IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b -IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb -IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 -IP6.DOMAIN[1]: sear6.fo.x.y -IP6.DOMAIN[2]: sear6.foo4.bar -DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 -DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 -DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 -DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected index 45c22a18fd..8fd6b1f2f4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -1,67 +1,19 @@ -location: clients/tests/test-client.py:768:test_003()/52 -cmd: $NMCLI -f ALL dev show eth0 +location: clients/tests/test-client.py:765:test_003()/52 +cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3262 bytes +stdout: 1061 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: C0:61:AE:26:4D:D7 -GENERAL.MTU: 0 -GENERAL.STATE: 20 (niedostępne) -GENERAL.REASON: 0 (Nie podano przyczyny) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nie -GENERAL.NM-MANAGED: tak -GENERAL.AUTOCONNECT: tak -GENERAL.FIRMWARE-MISSING: nie -GENERAL.NM-PLUGIN-MISSING: nie -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: nieznane -CAPABILITIES.CARRIER-DETECT: nie -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nie -CAPABILITIES.SRIOV: nie -WIRED-PROPERTIES.CARRIER: wyłączone -IP4.ADDRESS[1]: 192.168.6.238/29 -IP4.GATEWAY: -- -IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 -IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 -IP4.DNS[1]: 192.168.213.113 -IP4.DOMAIN[1]: sear4.foo4.bar -IP4.WINS[1]: 192.168.156.115 -IP4.WINS[2]: 192.168.8.33 -IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 -IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 -IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 -IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 -IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 -IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b -IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb -IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 -IP6.DOMAIN[1]: sear6.fo.x.y -IP6.DOMAIN[2]: sear6.foo4.bar -DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 -DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 -DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 -DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} -CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet -CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 -CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected index 5cf2168278..1347719dcc 100644 --- a/clients/tests/test-client.check-on-disk/test_003-053.expected +++ b/clients/tests/test-client.check-on-disk/test_003-053.expected @@ -1,14 +1,64 @@ -location: clients/tests/test-client.py:782:test_003()/53 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:768:test_003()/53 +cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 1370 bytes +stdout: 3239 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIRED-PROPERTIES.CARRIER: off +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected index 206d03e5c2..af8e50cb2d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-054.expected +++ b/clients/tests/test-client.check-on-disk/test_003-054.expected @@ -1,14 +1,64 @@ -location: clients/tests/test-client.py:782:test_003()/54 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:768:test_003()/54 +cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1380 bytes +stdout: 3262 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected index cfce15d234..c306656f59 100644 --- a/clients/tests/test-client.check-on-disk/test_003-055.expected +++ b/clients/tests/test-client.check-on-disk/test_003-055.expected @@ -1,13 +1,64 @@ -location: clients/tests/test-client.py:785:test_003()/55 -cmd: $NMCLI -f UUID,TYPE con +location: clients/tests/test-client.py:771:test_003()/55 +cmd: $NMCLI -f ALL -t dev show eth0 lang: C returncode: 0 -stdout: 192 bytes +stdout: 2011 bytes >>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +GENERAL.DEVICE:eth0 +GENERAL.TYPE:ethernet +GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:C0:61:AE:26:4D:D7 +GENERAL.MTU:0 +GENERAL.STATE:20 (unavailable) +GENERAL.REASON:0 (No reason given) +GENERAL.UDI:/sys/devices/virtual/eth0 +GENERAL.IP-IFACE: +GENERAL.IS-SOFTWARE:no +GENERAL.NM-MANAGED:yes +GENERAL.AUTOCONNECT:yes +GENERAL.FIRMWARE-MISSING:no +GENERAL.NM-PLUGIN-MISSING:no +GENERAL.PHYS-PORT-ID: +GENERAL.CONNECTION:ethernet +GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED:unknown +CAPABILITIES.CARRIER-DETECT:no +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:no +CAPABILITIES.SRIOV:no +WIRED-PROPERTIES.CARRIER:off +IP4.ADDRESS[1]:192.168.6.238/29 +IP4.GATEWAY: +IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]:192.168.213.113 +IP4.DOMAIN[1]:sear4.foo4.bar +IP4.WINS[1]:192.168.156.115 +IP4.WINS[2]:192.168.8.33 +IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]:sear6.fo.x.y +IP6.DOMAIN[2]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected index 135c11f106..9a14229824 100644 --- a/clients/tests/test-client.check-on-disk/test_003-056.expected +++ b/clients/tests/test-client.check-on-disk/test_003-056.expected @@ -1,13 +1,64 @@ -location: clients/tests/test-client.py:785:test_003()/56 -cmd: $NMCLI -f UUID,TYPE con +location: clients/tests/test-client.py:771:test_003()/56 +cmd: $NMCLI -f ALL -t dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 192 bytes +stdout: 2034 bytes >>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +GENERAL.DEVICE:eth0 +GENERAL.TYPE:ethernet +GENERAL.NM-TYPE:NMDeviceEthernet +GENERAL.VENDOR: +GENERAL.PRODUCT: +GENERAL.DRIVER:virtual +GENERAL.DRIVER-VERSION: +GENERAL.FIRMWARE-VERSION: +GENERAL.HWADDR:C0:61:AE:26:4D:D7 +GENERAL.MTU:0 +GENERAL.STATE:20 (niedostępne) +GENERAL.REASON:0 (Nie podano przyczyny) +GENERAL.UDI:/sys/devices/virtual/eth0 +GENERAL.IP-IFACE: +GENERAL.IS-SOFTWARE:nie +GENERAL.NM-MANAGED:tak +GENERAL.AUTOCONNECT:tak +GENERAL.FIRMWARE-MISSING:nie +GENERAL.NM-PLUGIN-MISSING:nie +GENERAL.PHYS-PORT-ID: +GENERAL.CONNECTION:ethernet +GENERAL.CON-UUID:UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH:/org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED:nieznane +CAPABILITIES.CARRIER-DETECT:nie +CAPABILITIES.SPEED:100 Mb/s +CAPABILITIES.IS-SOFTWARE:nie +CAPABILITIES.SRIOV:nie +WIRED-PROPERTIES.CARRIER:wyłączone +IP4.ADDRESS[1]:192.168.6.238/29 +IP4.GATEWAY: +IP4.ROUTE[1]:dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]:dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]:192.168.213.113 +IP4.DOMAIN[1]:sear4.foo4.bar +IP4.WINS[1]:192.168.156.115 +IP4.WINS[2]:192.168.8.33 +IP6.ADDRESS[1]:2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]:2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]:2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY:2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]:dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]:2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]:2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]:2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]:sear6.fo.x.y +IP6.DOMAIN[2]:sear6.foo4.bar +DHCP6.OPTION[1]:dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]:dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]:dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]:dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]:5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-057.expected b/clients/tests/test-client.check-on-disk/test_003-057.expected index 3d0e1134ad..f5d5a595a9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-057.expected +++ b/clients/tests/test-client.check-on-disk/test_003-057.expected @@ -1,15 +1,14 @@ -location: clients/tests/test-client.py:788:test_003()/57 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:785:test_003()/57 +cmd: $NMCLI -f ALL con lang: C returncode: 0 -stdout: 378 bytes +stdout: 1370 bytes >>> -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-058.expected b/clients/tests/test-client.check-on-disk/test_003-058.expected index e179b11e72..35899e35b7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-058.expected +++ b/clients/tests/test-client.check-on-disk/test_003-058.expected @@ -1,15 +1,14 @@ -location: clients/tests/test-client.py:788:test_003()/58 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:785:test_003()/58 +cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 -stdout: 378 bytes +stdout: 1380 bytes >>> -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-059.expected b/clients/tests/test-client.check-on-disk/test_003-059.expected index 9914e7618e..a8a62354d5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-059.expected +++ b/clients/tests/test-client.check-on-disk/test_003-059.expected @@ -1,15 +1,13 @@ -location: clients/tests/test-client.py:791:test_003()/59 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:788:test_003()/59 +cmd: $NMCLI -f UUID,TYPE con lang: C returncode: 0 -stdout: 186 bytes +stdout: 192 bytes >>> -UUID:UUID-ethernet-REPLACED-REPLACED-REPL -TYPE:802-3-ethernet -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-060.expected b/clients/tests/test-client.check-on-disk/test_003-060.expected index 8a013eb157..e9d944988c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-060.expected +++ b/clients/tests/test-client.check-on-disk/test_003-060.expected @@ -1,15 +1,13 @@ -location: clients/tests/test-client.py:791:test_003()/60 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:788:test_003()/60 +cmd: $NMCLI -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 -stdout: 186 bytes +stdout: 192 bytes >>> -UUID:UUID-ethernet-REPLACED-REPLACED-REPL -TYPE:802-3-ethernet -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-061.expected b/clients/tests/test-client.check-on-disk/test_003-061.expected index 5bde3ac412..6bc291cc6a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-061.expected +++ b/clients/tests/test-client.check-on-disk/test_003-061.expected @@ -1,21 +1,15 @@ -location: clients/tests/test-client.py:794:test_003()/61 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:791:test_003()/61 +cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: C returncode: 0 -stdout: 835 bytes +stdout: 378 bytes >>> -=============================================================================== - NetworkManager connection profiles -=============================================================================== UUID: UUID-ethernet-REPLACED-REPLACED-REPL TYPE: ethernet -------------------------------------------------------------------------------- UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d TYPE: ethernet -------------------------------------------------------------------------------- UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE: ethernet -------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected index 7826ba6cc4..230b137f59 100644 --- a/clients/tests/test-client.check-on-disk/test_003-062.expected +++ b/clients/tests/test-client.check-on-disk/test_003-062.expected @@ -1,21 +1,15 @@ -location: clients/tests/test-client.py:794:test_003()/62 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:791:test_003()/62 +cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: pl_PL.UTF-8 returncode: 0 -stdout: 841 bytes +stdout: 378 bytes >>> -=============================================================================== - Profile połączeń usługi NetworkManager -=============================================================================== UUID: UUID-ethernet-REPLACED-REPLACED-REPL TYPE: ethernet -------------------------------------------------------------------------------- UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d TYPE: ethernet -------------------------------------------------------------------------------- UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA TYPE: ethernet -------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected index 30c85d64e8..efcc632972 100644 --- a/clients/tests/test-client.check-on-disk/test_003-063.expected +++ b/clients/tests/test-client.check-on-disk/test_003-063.expected @@ -1,13 +1,15 @@ -location: clients/tests/test-client.py:797:test_003()/63 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:794:test_003()/63 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: C returncode: 0 -stdout: 192 bytes +stdout: 186 bytes >>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected index 38f487f241..247350d939 100644 --- a/clients/tests/test-client.check-on-disk/test_003-064.expected +++ b/clients/tests/test-client.check-on-disk/test_003-064.expected @@ -1,13 +1,15 @@ -location: clients/tests/test-client.py:797:test_003()/64 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:794:test_003()/64 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: pl_PL.UTF-8 returncode: 0 -stdout: 192 bytes +stdout: 186 bytes >>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected index 7093ba8047..bac005f773 100644 --- a/clients/tests/test-client.check-on-disk/test_003-065.expected +++ b/clients/tests/test-client.check-on-disk/test_003-065.expected @@ -1,12 +1,21 @@ -location: clients/tests/test-client.py:800:test_003()/65 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:797:test_003()/65 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: C returncode: 0 -stdout: 156 bytes +stdout: 835 bytes >>> -UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet +=============================================================================== + NetworkManager connection profiles +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected index 1b441dec58..816f3a9c6e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-066.expected +++ b/clients/tests/test-client.check-on-disk/test_003-066.expected @@ -1,12 +1,21 @@ -location: clients/tests/test-client.py:800:test_003()/66 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:797:test_003()/66 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: pl_PL.UTF-8 returncode: 0 -stdout: 156 bytes +stdout: 841 bytes >>> -UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected index cf884edd07..98776f3495 100644 --- a/clients/tests/test-client.check-on-disk/test_003-067.expected +++ b/clients/tests/test-client.check-on-disk/test_003-067.expected @@ -1,14 +1,10 @@ -location: clients/tests/test-client.py:803:test_003()/67 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:800:test_003()/67 +cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: C returncode: 0 -stdout: 394 bytes +stdout: 192 bytes >>> -====================================== - NetworkManager connection profiles -====================================== UUID TYPE --------------------------------------------------------------------------------------- UUID-ethernet-REPLACED-REPLACED-REPL ethernet 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet diff --git a/clients/tests/test-client.check-on-disk/test_003-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected index a928a88d65..a8cca3876b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-068.expected +++ b/clients/tests/test-client.check-on-disk/test_003-068.expected @@ -1,14 +1,10 @@ -location: clients/tests/test-client.py:803:test_003()/68 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:800:test_003()/68 +cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: pl_PL.UTF-8 returncode: 0 -stdout: 414 bytes +stdout: 192 bytes >>> -========================================== - Profile połączeń usługi NetworkManager -========================================== UUID TYPE ------------------------------------------------------------------------------------------- UUID-ethernet-REPLACED-REPLACED-REPL ethernet 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet diff --git a/clients/tests/test-client.check-on-disk/test_003-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected index ec092f7b7c..48634fcc50 100644 --- a/clients/tests/test-client.check-on-disk/test_003-069.expected +++ b/clients/tests/test-client.check-on-disk/test_003-069.expected @@ -1,113 +1,12 @@ -location: clients/tests/test-client.py:806:test_003()/69 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:803:test_003()/69 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: C returncode: 0 -stdout: 4891 bytes +stdout: 156 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: deactivating -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected index 2dc0faaa47..facdfda805 100644 --- a/clients/tests/test-client.check-on-disk/test_003-070.expected +++ b/clients/tests/test-client.check-on-disk/test_003-070.expected @@ -1,113 +1,12 @@ -location: clients/tests/test-client.py:806:test_003()/70 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:803:test_003()/70 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: pl_PL.UTF-8 returncode: 0 -stdout: 4918 bytes +stdout: 156 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: aktywowano -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: dezaktywowanie -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected index e07cfc7dc1..385ac34a88 100644 --- a/clients/tests/test-client.check-on-disk/test_003-071.expected +++ b/clients/tests/test-client.check-on-disk/test_003-071.expected @@ -1,100 +1,17 @@ -location: clients/tests/test-client.py:809:test_003()/71 -cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +location: clients/tests/test-client.py:806:test_003()/71 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: C returncode: 0 -stdout: 4226 bytes +stdout: 394 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: deactivating -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +====================================== + NetworkManager connection profiles +====================================== +UUID TYPE +-------------------------------------------------------------------------------------- +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected index baddcd6e2e..c28ce45f19 100644 --- a/clients/tests/test-client.check-on-disk/test_003-072.expected +++ b/clients/tests/test-client.check-on-disk/test_003-072.expected @@ -1,100 +1,17 @@ -location: clients/tests/test-client.py:809:test_003()/72 -cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +location: clients/tests/test-client.py:806:test_003()/72 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con lang: pl_PL.UTF-8 returncode: 0 -stdout: 4249 bytes +stdout: 414 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-duid: -- -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: dezaktywowanie -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +========================================== + Profile połączeń usługi NetworkManager +========================================== +UUID TYPE +------------------------------------------------------------------------------------------ +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected index 7a7bda97ad..1f7a3a1d66 100644 --- a/clients/tests/test-client.check-on-disk/test_003-073.expected +++ b/clients/tests/test-client.check-on-disk/test_003-073.expected @@ -1,14 +1,113 @@ -location: clients/tests/test-client.py:782:test_003()/73 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:809:test_003()/73 +cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 1370 bytes +stdout: 4891 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-074.expected b/clients/tests/test-client.check-on-disk/test_003-074.expected index b123899781..b4024a4606 100644 --- a/clients/tests/test-client.check-on-disk/test_003-074.expected +++ b/clients/tests/test-client.check-on-disk/test_003-074.expected @@ -1,14 +1,113 @@ -location: clients/tests/test-client.py:782:test_003()/74 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:809:test_003()/74 +cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 1380 bytes +stdout: 4918 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: aktywowano +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: dezaktywowanie +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected index 4c6a41089a..471fac37e1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-075.expected +++ b/clients/tests/test-client.check-on-disk/test_003-075.expected @@ -1,12 +1,100 @@ -location: clients/tests/test-client.py:785:test_003()/75 -cmd: $NMCLI -f UUID,TYPE con +location: clients/tests/test-client.py:812:test_003()/75 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: C returncode: 0 -stdout: 144 bytes +stdout: 4226 bytes >>> -UUID TYPE -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected index 22e1f5d638..edabe732fe 100644 --- a/clients/tests/test-client.check-on-disk/test_003-076.expected +++ b/clients/tests/test-client.check-on-disk/test_003-076.expected @@ -1,12 +1,100 @@ -location: clients/tests/test-client.py:785:test_003()/76 -cmd: $NMCLI -f UUID,TYPE con +location: clients/tests/test-client.py:812:test_003()/76 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 lang: pl_PL.UTF-8 returncode: 0 -stdout: 144 bytes +stdout: 4249 bytes >>> -UUID TYPE -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-duid: -- +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: dezaktywowanie +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected index fc1a98c39b..c6c8e0654f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-077.expected +++ b/clients/tests/test-client.check-on-disk/test_003-077.expected @@ -1,13 +1,64 @@ -location: clients/tests/test-client.py:788:test_003()/77 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:815:test_003()/77 +cmd: $NMCLI -f all dev show eth0 lang: C returncode: 0 -stdout: 252 bytes +stdout: 3239 bytes >>> -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIRED-PROPERTIES.CARRIER: off +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected index 235784b300..5fbd99d650 100644 --- a/clients/tests/test-client.check-on-disk/test_003-078.expected +++ b/clients/tests/test-client.check-on-disk/test_003-078.expected @@ -1,13 +1,64 @@ -location: clients/tests/test-client.py:788:test_003()/78 -cmd: $NMCLI -f UUID,TYPE --mode multiline con +location: clients/tests/test-client.py:815:test_003()/78 +cmd: $NMCLI -f all dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 252 bytes +stdout: 3262 bytes >>> -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-ethernet-REPLACED-REPLACED-REPL | ethernet +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected index 1d29e2eee7..92c9cf319e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-079.expected +++ b/clients/tests/test-client.check-on-disk/test_003-079.expected @@ -1,13 +1,14 @@ -location: clients/tests/test-client.py:791:test_003()/79 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:785:test_003()/79 +cmd: $NMCLI -f ALL con lang: C returncode: 0 -stdout: 124 bytes +stdout: 1370 bytes >>> -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth1 activated /org/freedesktop/NetworkManager/ActiveConnection/2 -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-080.expected b/clients/tests/test-client.check-on-disk/test_003-080.expected index 7140e0f6e5..880d552e96 100644 --- a/clients/tests/test-client.check-on-disk/test_003-080.expected +++ b/clients/tests/test-client.check-on-disk/test_003-080.expected @@ -1,13 +1,14 @@ -location: clients/tests/test-client.py:791:test_003()/80 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +location: clients/tests/test-client.py:785:test_003()/80 +cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 -stdout: 124 bytes +stdout: 1380 bytes >>> -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth1 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/2 -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- -- -- -- -- /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-081.expected b/clients/tests/test-client.check-on-disk/test_003-081.expected index 11b6b39501..c228e2b103 100644 --- a/clients/tests/test-client.check-on-disk/test_003-081.expected +++ b/clients/tests/test-client.check-on-disk/test_003-081.expected @@ -1,18 +1,12 @@ -location: clients/tests/test-client.py:794:test_003()/81 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:788:test_003()/81 +cmd: $NMCLI -f UUID,TYPE con lang: C returncode: 0 -stdout: 629 bytes +stdout: 144 bytes >>> -=============================================================================== - NetworkManager connection profiles -=============================================================================== -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet -------------------------------------------------------------------------------- +UUID TYPE +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-082.expected b/clients/tests/test-client.check-on-disk/test_003-082.expected index 39fe6f5275..5139cf8636 100644 --- a/clients/tests/test-client.check-on-disk/test_003-082.expected +++ b/clients/tests/test-client.check-on-disk/test_003-082.expected @@ -1,18 +1,12 @@ -location: clients/tests/test-client.py:794:test_003()/82 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +location: clients/tests/test-client.py:788:test_003()/82 +cmd: $NMCLI -f UUID,TYPE con lang: pl_PL.UTF-8 returncode: 0 -stdout: 635 bytes +stdout: 144 bytes >>> -=============================================================================== - Profile połączeń usługi NetworkManager -=============================================================================== -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet -------------------------------------------------------------------------------- +UUID TYPE +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-083.expected b/clients/tests/test-client.check-on-disk/test_003-083.expected index 6b9dc5c8db..40239673c2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-083.expected +++ b/clients/tests/test-client.check-on-disk/test_003-083.expected @@ -1,12 +1,13 @@ -location: clients/tests/test-client.py:797:test_003()/83 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:791:test_003()/83 +cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: C returncode: 0 -stdout: 144 bytes +stdout: 252 bytes >>> -UUID TYPE -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-084.expected b/clients/tests/test-client.check-on-disk/test_003-084.expected index e49e2808fb..41ef62b92f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-084.expected +++ b/clients/tests/test-client.check-on-disk/test_003-084.expected @@ -1,12 +1,13 @@ -location: clients/tests/test-client.py:797:test_003()/84 -cmd: $NMCLI -f UUID,TYPE --mode tabular con +location: clients/tests/test-client.py:791:test_003()/84 +cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: pl_PL.UTF-8 returncode: 0 -stdout: 144 bytes +stdout: 252 bytes >>> -UUID TYPE -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-085.expected b/clients/tests/test-client.check-on-disk/test_003-085.expected index 09e3359afc..171c0a22fa 100644 --- a/clients/tests/test-client.check-on-disk/test_003-085.expected +++ b/clients/tests/test-client.check-on-disk/test_003-085.expected @@ -1,11 +1,13 @@ -location: clients/tests/test-client.py:800:test_003()/85 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:794:test_003()/85 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: C returncode: 0 -stdout: 104 bytes +stdout: 124 bytes >>> -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-086.expected b/clients/tests/test-client.check-on-disk/test_003-086.expected index bc3c33b64d..df3f260f5c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-086.expected +++ b/clients/tests/test-client.check-on-disk/test_003-086.expected @@ -1,11 +1,13 @@ -location: clients/tests/test-client.py:800:test_003()/86 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +location: clients/tests/test-client.py:794:test_003()/86 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con lang: pl_PL.UTF-8 returncode: 0 -stdout: 104 bytes +stdout: 124 bytes >>> -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-087.expected b/clients/tests/test-client.check-on-disk/test_003-087.expected index 63654ed081..560167768b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-087.expected +++ b/clients/tests/test-client.check-on-disk/test_003-087.expected @@ -1,16 +1,18 @@ -location: clients/tests/test-client.py:803:test_003()/87 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:797:test_003()/87 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: C returncode: 0 -stdout: 346 bytes +stdout: 629 bytes >>> -====================================== - NetworkManager connection profiles -====================================== -UUID TYPE --------------------------------------------------------------------------------------- -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +=============================================================================== + NetworkManager connection profiles +=============================================================================== +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-088.expected b/clients/tests/test-client.check-on-disk/test_003-088.expected index 6a3c2024fa..958d598838 100644 --- a/clients/tests/test-client.check-on-disk/test_003-088.expected +++ b/clients/tests/test-client.check-on-disk/test_003-088.expected @@ -1,16 +1,18 @@ -location: clients/tests/test-client.py:803:test_003()/88 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +location: clients/tests/test-client.py:797:test_003()/88 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con lang: pl_PL.UTF-8 returncode: 0 -stdout: 366 bytes +stdout: 635 bytes >>> -========================================== - Profile połączeń usługi NetworkManager -========================================== -UUID TYPE ------------------------------------------------------------------------------------------- -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-089.expected b/clients/tests/test-client.check-on-disk/test_003-089.expected index 224f85c806..3fec79882e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-089.expected +++ b/clients/tests/test-client.check-on-disk/test_003-089.expected @@ -1,13 +1,15 @@ -location: clients/tests/test-client.py:806:test_003()/89 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:800:test_003()/89 +cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: C -returncode: 10 -stdout: 0 bytes +returncode: 0 +stdout: 144 bytes +>>> +UUID TYPE +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes >>> <<< -stderr: 46 bytes ->>> -Error: ethernet - no such connection profile. - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-090.expected b/clients/tests/test-client.check-on-disk/test_003-090.expected index 37ed36703e..da853fb0e3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-090.expected +++ b/clients/tests/test-client.check-on-disk/test_003-090.expected @@ -1,13 +1,15 @@ -location: clients/tests/test-client.py:806:test_003()/90 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:800:test_003()/90 +cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: pl_PL.UTF-8 -returncode: 10 -stdout: 0 bytes +returncode: 0 +stdout: 144 bytes +>>> +UUID TYPE +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes >>> <<< -stderr: 58 bytes ->>> -Błąd: ethernet — nie ma takiego profilu połączenia. - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-091.expected b/clients/tests/test-client.check-on-disk/test_003-091.expected index 2ca03c8cba..408c6818ae 100644 --- a/clients/tests/test-client.check-on-disk/test_003-091.expected +++ b/clients/tests/test-client.check-on-disk/test_003-091.expected @@ -1,21 +1,11 @@ -location: clients/tests/test-client.py:809:test_003()/91 -cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +location: clients/tests/test-client.py:803:test_003()/91 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: C returncode: 0 -stdout: 667 bytes +stdout: 104 bytes >>> -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: deactivating -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-092.expected b/clients/tests/test-client.check-on-disk/test_003-092.expected index 4d43a4a4c6..beaf711ff9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-092.expected +++ b/clients/tests/test-client.check-on-disk/test_003-092.expected @@ -1,21 +1,11 @@ -location: clients/tests/test-client.py:809:test_003()/92 -cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +location: clients/tests/test-client.py:803:test_003()/92 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con lang: pl_PL.UTF-8 returncode: 0 -stdout: 672 bytes +stdout: 104 bytes >>> -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: dezaktywowanie -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-093.expected b/clients/tests/test-client.check-on-disk/test_003-093.expected new file mode 100644 index 0000000000..fbe67020e7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-093.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:806:test_003()/93 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: C +returncode: 0 +stdout: 346 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +UUID TYPE +-------------------------------------------------------------------------------------- +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-094.expected b/clients/tests/test-client.check-on-disk/test_003-094.expected new file mode 100644 index 0000000000..352b6e6e61 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-094.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:806:test_003()/94 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 366 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +UUID TYPE +------------------------------------------------------------------------------------------ +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-095.expected b/clients/tests/test-client.check-on-disk/test_003-095.expected new file mode 100644 index 0000000000..070442da29 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-095.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:809:test_003()/95 +cmd: $NMCLI con s ethernet +lang: C +returncode: 10 +stdout: 0 bytes +>>> + +<<< +stderr: 46 bytes +>>> +Error: ethernet - no such connection profile. + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-096.expected b/clients/tests/test-client.check-on-disk/test_003-096.expected new file mode 100644 index 0000000000..5f1c983a09 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-096.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:809:test_003()/96 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 +returncode: 10 +stdout: 0 bytes +>>> + +<<< +stderr: 58 bytes +>>> +Błąd: ethernet — nie ma takiego profilu połączenia. + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-097.expected b/clients/tests/test-client.check-on-disk/test_003-097.expected new file mode 100644 index 0000000000..20edeeeb29 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-097.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:812:test_003()/97 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: C +returncode: 0 +stdout: 667 bytes +>>> +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-098.expected b/clients/tests/test-client.check-on-disk/test_003-098.expected new file mode 100644 index 0000000000..19269bffe1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-098.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:812:test_003()/98 +cmd: $NMCLI c s /org/freedesktop/NetworkManager/ActiveConnection/1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 672 bytes +>>> +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: dezaktywowanie +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-099.expected b/clients/tests/test-client.check-on-disk/test_003-099.expected new file mode 100644 index 0000000000..bd1e167b7d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-099.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:815:test_003()/99 +cmd: $NMCLI -f all dev show eth0 +lang: C +returncode: 0 +stdout: 3207 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIRED-PROPERTIES.CARRIER: off +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: (null) | (null) +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-100.expected b/clients/tests/test-client.check-on-disk/test_003-100.expected new file mode 100644 index 0000000000..9af95ebe72 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-100.expected @@ -0,0 +1,67 @@ +location: clients/tests/test-client.py:815:test_003()/100 +cmd: $NMCLI -f all dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3230 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: C0:61:AE:26:4D:D7 +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +IP4.ADDRESS[1]: 192.168.6.238/29 +IP4.GATEWAY: -- +IP4.ROUTE[1]: dst = 192.168.58.133/31, nh = 192.168.50.116, mt = 3130348792 +IP4.ROUTE[2]: dst = 192.168.155.50/19, nh = 192.168.127.64 +IP4.DNS[1]: 192.168.213.113 +IP4.DOMAIN[1]: sear4.foo4.bar +IP4.WINS[1]: 192.168.156.115 +IP4.WINS[2]: 192.168.8.33 +IP6.ADDRESS[1]: 2001:a::29c0:62b9:2e01:30a/69 +IP6.ADDRESS[2]: 2001:a::6433:6420:34f9:3801/115 +IP6.ADDRESS[3]: 2001:a::8191:ed6b:8ce:b60/103 +IP6.GATEWAY: 2001:a::2b50:64d1:9a91:23b4 +IP6.ROUTE[1]: dst = 2001:a::5ecb:f5ee:fb96:856c/100, nh = ::, mt = 4249082794 +IP6.DNS[1]: 2001:a::1323:9a78:2b82:d16b +IP6.DNS[2]: 2001:a::4e1:24e6:b8c1:91bb +IP6.DNS[3]: 2001:a::bd96:3bed:fbd6:19c5 +IP6.DOMAIN[1]: sear6.fo.x.y +IP6.DOMAIN[2]: sear6.foo4.bar +DHCP6.OPTION[1]: dhcp-6-opt-1 = val-1 +DHCP6.OPTION[2]: dhcp-6-opt-5 = val-5 +DHCP6.OPTION[3]: dhcp-6-opt-6 = val-6 +DHCP6.OPTION[4]: dhcp-6-opt-8 = val-8 +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3,2,1} +CONNECTIONS.AVAILABLE-CONNECTIONS[1]: (null) | (null) +CONNECTIONS.AVAILABLE-CONNECTIONS[2]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 +CONNECTIONS.AVAILABLE-CONNECTIONS[3]: 5fcfd6d7-1e63-3332-8826-a7eda103792d | con-1 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_004-001.expected b/clients/tests/test-client.check-on-disk/test_004-001.expected index 9cb9f227d7..92b2becb9f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-001.expected +++ b/clients/tests/test-client.check-on-disk/test_004-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:819:test_004()/1 +location: clients/tests/test-client.py:825:test_004()/1 cmd: $NMCLI c add type wifi ifname '*' ssid foobar con-name con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-002.expected b/clients/tests/test-client.check-on-disk/test_004-002.expected index b83687557b..0ce7b918e8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-002.expected +++ b/clients/tests/test-client.check-on-disk/test_004-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:821:test_004()/2 +location: clients/tests/test-client.py:827:test_004()/2 cmd: $NMCLI connection mod con-xx1 ip.gateway '' lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_004-003.expected b/clients/tests/test-client.check-on-disk/test_004-003.expected index b12341c5a4..efb86c4adb 100644 --- a/clients/tests/test-client.check-on-disk/test_004-003.expected +++ b/clients/tests/test-client.check-on-disk/test_004-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:822:test_004()/3 +location: clients/tests/test-client.py:828:test_004()/3 cmd: $NMCLI connection mod con-xx1 ipv4.gateway 172.16.0.1 lang: pl_PL.UTF-8 returncode: 1 diff --git a/clients/tests/test-client.check-on-disk/test_004-004.expected b/clients/tests/test-client.check-on-disk/test_004-004.expected index 797937d75f..ae06189bcb 100644 --- a/clients/tests/test-client.check-on-disk/test_004-004.expected +++ b/clients/tests/test-client.check-on-disk/test_004-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:823:test_004()/4 +location: clients/tests/test-client.py:829:test_004()/4 cmd: $NMCLI connection mod con-xx1 ipv6.gateway ::99 lang: C returncode: 1 diff --git a/clients/tests/test-client.check-on-disk/test_004-005.expected b/clients/tests/test-client.check-on-disk/test_004-005.expected index b976143dc5..73c67ad5bf 100644 --- a/clients/tests/test-client.check-on-disk/test_004-005.expected +++ b/clients/tests/test-client.check-on-disk/test_004-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:824:test_004()/5 +location: clients/tests/test-client.py:830:test_004()/5 cmd: $NMCLI connection mod con-xx1 802.abc '' lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_004-006.expected b/clients/tests/test-client.check-on-disk/test_004-006.expected index 5115ea1e71..0a0bf98293 100644 --- a/clients/tests/test-client.check-on-disk/test_004-006.expected +++ b/clients/tests/test-client.check-on-disk/test_004-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:825:test_004()/6 +location: clients/tests/test-client.py:831:test_004()/6 cmd: $NMCLI connection mod con-xx1 802-11-wireless.band a lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-007.expected b/clients/tests/test-client.check-on-disk/test_004-007.expected index 1f52f4e720..58a265fa28 100644 --- a/clients/tests/test-client.check-on-disk/test_004-007.expected +++ b/clients/tests/test-client.check-on-disk/test_004-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:826:test_004()/7 +location: clients/tests/test-client.py:832:test_004()/7 cmd: $NMCLI connection mod con-xx1 ipv4.addresses 192.168.77.5/24 ipv4.routes '2.3.4.5/32 192.168.77.1' ipv6.addresses 1:2:3:4::6/64 ipv6.routes 1:2:3:4:5:6::5/128 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-008.expected b/clients/tests/test-client.check-on-disk/test_004-008.expected index 6b53a83708..db1c1646fe 100644 --- a/clients/tests/test-client.check-on-disk/test_004-008.expected +++ b/clients/tests/test-client.check-on-disk/test_004-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:828:test_004()/8 +location: clients/tests/test-client.py:834:test_004()/8 cmd: $NMCLI con s con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-009.expected b/clients/tests/test-client.check-on-disk/test_004-009.expected index 81131d3364..28394d5963 100644 --- a/clients/tests/test-client.check-on-disk/test_004-009.expected +++ b/clients/tests/test-client.check-on-disk/test_004-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:828:test_004()/9 +location: clients/tests/test-client.py:834:test_004()/9 cmd: $NMCLI con s con-xx1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-010.expected b/clients/tests/test-client.check-on-disk/test_004-010.expected index f502c7180d..d4b21d896f 100644 --- a/clients/tests/test-client.check-on-disk/test_004-010.expected +++ b/clients/tests/test-client.check-on-disk/test_004-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:835:test_004()/10 +location: clients/tests/test-client.py:841:test_004()/10 cmd: $NMCLI connection add type vpn con-name con-vpn-1 ifname '*' vpn-type openvpn vpn.data 'key1 = val1, key2 = val2, key3=val3' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-011.expected b/clients/tests/test-client.check-on-disk/test_004-011.expected index 158241e7a7..7312dd104c 100644 --- a/clients/tests/test-client.check-on-disk/test_004-011.expected +++ b/clients/tests/test-client.check-on-disk/test_004-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:838:test_004()/11 +location: clients/tests/test-client.py:844:test_004()/11 cmd: $NMCLI con s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-012.expected b/clients/tests/test-client.check-on-disk/test_004-012.expected index 65de04bc85..b57139da37 100644 --- a/clients/tests/test-client.check-on-disk/test_004-012.expected +++ b/clients/tests/test-client.check-on-disk/test_004-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:838:test_004()/12 +location: clients/tests/test-client.py:844:test_004()/12 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-013.expected b/clients/tests/test-client.check-on-disk/test_004-013.expected index 8f7381fb3c..9db8f138b6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-013.expected +++ b/clients/tests/test-client.check-on-disk/test_004-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:840:test_004()/13 +location: clients/tests/test-client.py:846:test_004()/13 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-014.expected b/clients/tests/test-client.check-on-disk/test_004-014.expected index 57c13711b6..270e897980 100644 --- a/clients/tests/test-client.check-on-disk/test_004-014.expected +++ b/clients/tests/test-client.check-on-disk/test_004-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:840:test_004()/14 +location: clients/tests/test-client.py:846:test_004()/14 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-015.expected b/clients/tests/test-client.check-on-disk/test_004-015.expected index 863e5f4fc1..aac7a54c50 100644 --- a/clients/tests/test-client.check-on-disk/test_004-015.expected +++ b/clients/tests/test-client.check-on-disk/test_004-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:842:test_004()/15 +location: clients/tests/test-client.py:848:test_004()/15 cmd: $NMCLI con up con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-016.expected b/clients/tests/test-client.check-on-disk/test_004-016.expected index 69f902dc86..a345b9e6d3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-016.expected +++ b/clients/tests/test-client.check-on-disk/test_004-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:844:test_004()/16 +location: clients/tests/test-client.py:850:test_004()/16 cmd: $NMCLI con s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-017.expected b/clients/tests/test-client.check-on-disk/test_004-017.expected index e125cb8ae2..22bdd78429 100644 --- a/clients/tests/test-client.check-on-disk/test_004-017.expected +++ b/clients/tests/test-client.check-on-disk/test_004-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:844:test_004()/17 +location: clients/tests/test-client.py:850:test_004()/17 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-018.expected b/clients/tests/test-client.check-on-disk/test_004-018.expected index 4cab2aee8b..f87b11b012 100644 --- a/clients/tests/test-client.check-on-disk/test_004-018.expected +++ b/clients/tests/test-client.check-on-disk/test_004-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:846:test_004()/18 +location: clients/tests/test-client.py:852:test_004()/18 cmd: $NMCLI con up con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-019.expected b/clients/tests/test-client.check-on-disk/test_004-019.expected index c7ceb89c20..36b0486415 100644 --- a/clients/tests/test-client.check-on-disk/test_004-019.expected +++ b/clients/tests/test-client.check-on-disk/test_004-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:848:test_004()/19 +location: clients/tests/test-client.py:854:test_004()/19 cmd: $NMCLI con s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-020.expected b/clients/tests/test-client.check-on-disk/test_004-020.expected index 2da441a184..03737e0f22 100644 --- a/clients/tests/test-client.check-on-disk/test_004-020.expected +++ b/clients/tests/test-client.check-on-disk/test_004-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:848:test_004()/20 +location: clients/tests/test-client.py:854:test_004()/20 cmd: $NMCLI con s lang: pl_PL.UTF-8 returncode: 0 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 8be324105f..bb58b4800a 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 @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:850:test_004()/21 +location: clients/tests/test-client.py:856:test_004()/21 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 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 50c01f2854..8acf3efd0b 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 @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:850:test_004()/22 +location: clients/tests/test-client.py:856:test_004()/22 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-023.expected b/clients/tests/test-client.check-on-disk/test_004-023.expected index 5be2d83299..a166da637a 100644 --- a/clients/tests/test-client.check-on-disk/test_004-023.expected +++ b/clients/tests/test-client.check-on-disk/test_004-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:859:test_004()/23 +location: clients/tests/test-client.py:865:test_004()/23 cmd: $NMCLI con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-024.expected b/clients/tests/test-client.check-on-disk/test_004-024.expected index e05d8f2de0..5481f2b97b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-024.expected +++ b/clients/tests/test-client.check-on-disk/test_004-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:859:test_004()/24 +location: clients/tests/test-client.py:865:test_004()/24 cmd: $NMCLI con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-025.expected b/clients/tests/test-client.check-on-disk/test_004-025.expected index 446700c2d0..4998dc27b9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-025.expected +++ b/clients/tests/test-client.check-on-disk/test_004-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:861:test_004()/25 +location: clients/tests/test-client.py:867:test_004()/25 cmd: $NMCLI -t con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-026.expected b/clients/tests/test-client.check-on-disk/test_004-026.expected index d15eb96bea..af95afb192 100644 --- a/clients/tests/test-client.check-on-disk/test_004-026.expected +++ b/clients/tests/test-client.check-on-disk/test_004-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:861:test_004()/26 +location: clients/tests/test-client.py:867:test_004()/26 cmd: $NMCLI -t con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-027.expected b/clients/tests/test-client.check-on-disk/test_004-027.expected index f11fdafc0a..41dcdd28aa 100644 --- a/clients/tests/test-client.check-on-disk/test_004-027.expected +++ b/clients/tests/test-client.check-on-disk/test_004-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:864:test_004()/27 +location: clients/tests/test-client.py:870:test_004()/27 cmd: $NMCLI -f ALL con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-028.expected b/clients/tests/test-client.check-on-disk/test_004-028.expected index e1e71ebc22..02d204faf8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-028.expected +++ b/clients/tests/test-client.check-on-disk/test_004-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:864:test_004()/28 +location: clients/tests/test-client.py:870:test_004()/28 cmd: $NMCLI -f ALL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-029.expected b/clients/tests/test-client.check-on-disk/test_004-029.expected index 76ce58dc71..993f980745 100644 --- a/clients/tests/test-client.check-on-disk/test_004-029.expected +++ b/clients/tests/test-client.check-on-disk/test_004-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:870:test_004()/29 +location: clients/tests/test-client.py:876:test_004()/29 cmd: $NMCLI -f VPN con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-030.expected b/clients/tests/test-client.check-on-disk/test_004-030.expected index 9ad1dfaeb9..a1399831d2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-030.expected +++ b/clients/tests/test-client.check-on-disk/test_004-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:870:test_004()/30 +location: clients/tests/test-client.py:876:test_004()/30 cmd: $NMCLI -f VPN con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-031.expected b/clients/tests/test-client.check-on-disk/test_004-031.expected index 22ea1fa18e..2ce9130980 100644 --- a/clients/tests/test-client.check-on-disk/test_004-031.expected +++ b/clients/tests/test-client.check-on-disk/test_004-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:873:test_004()/31 +location: clients/tests/test-client.py:879:test_004()/31 cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-032.expected b/clients/tests/test-client.check-on-disk/test_004-032.expected index 66d2031a8d..6fb7ad6e86 100644 --- a/clients/tests/test-client.check-on-disk/test_004-032.expected +++ b/clients/tests/test-client.check-on-disk/test_004-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:873:test_004()/32 +location: clients/tests/test-client.py:879:test_004()/32 cmd: $NMCLI -f GENERAL con s con-vpn-1 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-033.expected b/clients/tests/test-client.check-on-disk/test_004-033.expected index a86acc632a..68cfe074bd 100644 --- a/clients/tests/test-client.check-on-disk/test_004-033.expected +++ b/clients/tests/test-client.check-on-disk/test_004-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:876:test_004()/33 +location: clients/tests/test-client.py:882:test_004()/33 cmd: $NMCLI dev show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-034.expected b/clients/tests/test-client.check-on-disk/test_004-034.expected index fa5327a678..171ac470a6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-034.expected +++ b/clients/tests/test-client.check-on-disk/test_004-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:876:test_004()/34 +location: clients/tests/test-client.py:882:test_004()/34 cmd: $NMCLI dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-035.expected b/clients/tests/test-client.check-on-disk/test_004-035.expected index 2f878f84bb..10b59bdc6e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-035.expected +++ b/clients/tests/test-client.check-on-disk/test_004-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:879:test_004()/35 +location: clients/tests/test-client.py:885:test_004()/35 cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-036.expected b/clients/tests/test-client.check-on-disk/test_004-036.expected index cc659c0377..7bc41f541b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-036.expected +++ b/clients/tests/test-client.check-on-disk/test_004-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:879:test_004()/36 +location: clients/tests/test-client.py:885:test_004()/36 cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-037.expected b/clients/tests/test-client.check-on-disk/test_004-037.expected index 629a9b8254..a35d7688a7 100644 --- a/clients/tests/test-client.check-on-disk/test_004-037.expected +++ b/clients/tests/test-client.check-on-disk/test_004-037.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:882:test_004()/37 +location: clients/tests/test-client.py:888:test_004()/37 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-038.expected b/clients/tests/test-client.check-on-disk/test_004-038.expected index 0d3386a330..41e3ec38ba 100644 --- a/clients/tests/test-client.check-on-disk/test_004-038.expected +++ b/clients/tests/test-client.check-on-disk/test_004-038.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:882:test_004()/38 +location: clients/tests/test-client.py:888:test_004()/38 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-039.expected b/clients/tests/test-client.check-on-disk/test_004-039.expected index 612a041ef7..24f5546053 100644 --- a/clients/tests/test-client.check-on-disk/test_004-039.expected +++ b/clients/tests/test-client.check-on-disk/test_004-039.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:885:test_004()/39 +location: clients/tests/test-client.py:891:test_004()/39 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-040.expected b/clients/tests/test-client.check-on-disk/test_004-040.expected index ffe73a0f9d..f1b24f992d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-040.expected +++ b/clients/tests/test-client.check-on-disk/test_004-040.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:885:test_004()/40 +location: clients/tests/test-client.py:891:test_004()/40 cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES -t dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-041.expected b/clients/tests/test-client.check-on-disk/test_004-041.expected index c50258737d..36470325ee 100644 --- a/clients/tests/test-client.check-on-disk/test_004-041.expected +++ b/clients/tests/test-client.check-on-disk/test_004-041.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:888:test_004()/41 +location: clients/tests/test-client.py:894:test_004()/41 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004-042.expected b/clients/tests/test-client.check-on-disk/test_004-042.expected index c836b2a837..1f649565cc 100644 --- a/clients/tests/test-client.check-on-disk/test_004-042.expected +++ b/clients/tests/test-client.check-on-disk/test_004-042.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:888:test_004()/42 +location: clients/tests/test-client.py:894:test_004()/42 cmd: $NMCLI -f DEVICE,TYPE,DBUS-PATH dev lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index ec1443dc66..4b84a9422d 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -767,6 +767,9 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'], replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', '-t', 'dev', 'show', 'eth0'], + replace_stdout = replace_stdout) + self.async_wait() self.srv.setProperty('/org/freedesktop/NetworkManager/ActiveConnection/1', @@ -808,6 +811,9 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['c', 's', '/org/freedesktop/NetworkManager/ActiveConnection/1'], replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'all', 'dev', 'show', 'eth0'], + replace_stdout = replace_stdout) + def test_004(self): self.init_001()