From 4e7ae3da6e862ec60a7c8263783b29cdf086c22e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 8 Jun 2018 08:08:58 +0200 Subject: [PATCH] cli: fix printing multi-line output when there is nothing to print When a property getter returns an empty/missing strv-array, in multi-line mode we should not print any lines. To get that right, we must mark the cell as STRV type, even if there is no value provided. Previously, with text_out_flags having NM_META_ACCESSOR_GET_OUT_FLAGS_STRV and value being NULL, we would not set cell->text_format = PRINT_DATA_CELL_FORMAT_TYPE_STRV; and thus, later on the value would be treated as a missing (plain) string. --- clients/cli/utils.c | 18 ++++++++++-------- .../test_004-033.expected | 3 +-- .../test_004-034.expected | 3 +-- .../test_004-035.expected | 3 +-- .../test_004-036.expected | 3 +-- .../test_004-055.expected | 3 +-- .../test_004-056.expected | 3 +-- .../test_004-057.expected | 3 +-- .../test_004-058.expected | 3 +-- .../test_004-059.expected | 3 +-- .../test_004-060.expected | 3 +-- .../test_004-073.expected | 3 +-- .../test_004-074.expected | 3 +-- .../test_004-075.expected | 3 +-- .../test_004-076.expected | 3 +-- .../test_004-077.expected | 3 +-- .../test_004-078.expected | 3 +-- .../test_004-091.expected | 3 +-- .../test_004-092.expected | 3 +-- .../test_004-093.expected | 3 +-- .../test_004-094.expected | 3 +-- .../test_004-095.expected | 3 +-- .../test_004-096.expected | 3 +-- .../test_004-163.expected | 3 +-- .../test_004-164.expected | 3 +-- .../test_004-165.expected | 3 +-- .../test_004-166.expected | 3 +-- .../test_004-167.expected | 3 +-- .../test_004-168.expected | 3 +-- .../test_004-181.expected | 3 +-- .../test_004-182.expected | 3 +-- .../test_004-183.expected | 3 +-- .../test_004-184.expected | 3 +-- .../test_004-185.expected | 3 +-- .../test_004-186.expected | 3 +-- .../test_004-199.expected | 3 +-- .../test_004-200.expected | 3 +-- .../test_004-201.expected | 3 +-- .../test_004-202.expected | 3 +-- .../test_004-203.expected | 3 +-- .../test_004-204.expected | 3 +-- 41 files changed, 50 insertions(+), 88 deletions(-) diff --git a/clients/cli/utils.c b/clients/cli/utils.c index 7d687c2c29..365a03030e 100644 --- a/clients/cli/utils.c +++ b/clients/cli/utils.c @@ -1046,20 +1046,22 @@ _print_fill (const NmcConfig *nmc_config, &is_default, (gpointer *) &to_free); + nm_assert (!to_free || value == to_free); + header_cell->skip = nmc_config->overview && is_default; if (NM_FLAGS_HAS (text_out_flags, NM_META_ACCESSOR_GET_OUT_FLAGS_STRV)) { - if (value) { - if (nmc_config->multiline_output) { - cell->text_format = PRINT_DATA_CELL_FORMAT_TYPE_STRV; - cell->text.strv = value; - cell->text_to_free = !!to_free; - } else { + if (nmc_config->multiline_output) { + cell->text_format = PRINT_DATA_CELL_FORMAT_TYPE_STRV; + cell->text.strv = value; + cell->text_to_free = !!to_free; + } else { + if (value && ((const char *const*) value)[0]) { cell->text.plain = g_strjoinv (" | ", (char **) value); cell->text_to_free = TRUE; - if (to_free) - g_strfreev ((char **) to_free); } + if (to_free) + g_strfreev ((char **) to_free); } } else { cell->text.plain = value; 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 80cd261d55..7325c535d7 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:971:test_004()/33 cmd: $NMCLI dev show wlan0 lang: C returncode: 0 -stdout: 1406 bytes +stdout: 1363 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -14,7 +14,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar 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 2189c9f1e9..d6e9e50340 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:971:test_004()/34 cmd: $NMCLI dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1407 bytes +stdout: 1364 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -14,7 +14,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar 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 6b6fdd46ad..efd113db24 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:974:test_004()/35 cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 -stdout: 4643 bytes +stdout: 4600 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar 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 937bedde3c..a1e7e1a782 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:974:test_004()/36 cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4686 bytes +stdout: 4643 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-055.expected b/clients/tests/test-client.check-on-disk/test_004-055.expected index 493f0ae2b4..52ff6ac789 100644 --- a/clients/tests/test-client.check-on-disk/test_004-055.expected +++ b/clients/tests/test-client.check-on-disk/test_004-055.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/55 cmd: $NMCLI -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4643 bytes +stdout: 4600 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-056.expected b/clients/tests/test-client.check-on-disk/test_004-056.expected index 105c4c7e02..51c0b26dde 100644 --- a/clients/tests/test-client.check-on-disk/test_004-056.expected +++ b/clients/tests/test-client.check-on-disk/test_004-056.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/56 cmd: $NMCLI -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4686 bytes +stdout: 4643 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-057.expected b/clients/tests/test-client.check-on-disk/test_004-057.expected index 1b541cfa48..e1d0698a32 100644 --- a/clients/tests/test-client.check-on-disk/test_004-057.expected +++ b/clients/tests/test-client.check-on-disk/test_004-057.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/57 cmd: $NMCLI -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 1406 bytes +stdout: 1363 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -14,7 +14,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-058.expected b/clients/tests/test-client.check-on-disk/test_004-058.expected index 6908ef8403..00dea8d24b 100644 --- a/clients/tests/test-client.check-on-disk/test_004-058.expected +++ b/clients/tests/test-client.check-on-disk/test_004-058.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/58 cmd: $NMCLI -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1407 bytes +stdout: 1364 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -14,7 +14,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-059.expected b/clients/tests/test-client.check-on-disk/test_004-059.expected index a6a6595a88..348cb5bd27 100644 --- a/clients/tests/test-client.check-on-disk/test_004-059.expected +++ b/clients/tests/test-client.check-on-disk/test_004-059.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/59 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4643 bytes +stdout: 4600 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-060.expected b/clients/tests/test-client.check-on-disk/test_004-060.expected index d3e49e823e..10214d1b01 100644 --- a/clients/tests/test-client.check-on-disk/test_004-060.expected +++ b/clients/tests/test-client.check-on-disk/test_004-060.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/60 cmd: $NMCLI -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4686 bytes +stdout: 4643 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-073.expected b/clients/tests/test-client.check-on-disk/test_004-073.expected index cdeb91b5e9..1ccc53c218 100644 --- a/clients/tests/test-client.check-on-disk/test_004-073.expected +++ b/clients/tests/test-client.check-on-disk/test_004-073.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/73 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5734 bytes +stdout: 5691 bytes >>> =============================================================================== Device details (wlan0) @@ -77,7 +77,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-074.expected b/clients/tests/test-client.check-on-disk/test_004-074.expected index 28585a9887..078b83a210 100644 --- a/clients/tests/test-client.check-on-disk/test_004-074.expected +++ b/clients/tests/test-client.check-on-disk/test_004-074.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/74 cmd: $NMCLI --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5784 bytes +stdout: 5741 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -77,7 +77,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-075.expected b/clients/tests/test-client.check-on-disk/test_004-075.expected index b50650f1f4..b1326a2261 100644 --- a/clients/tests/test-client.check-on-disk/test_004-075.expected +++ b/clients/tests/test-client.check-on-disk/test_004-075.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/75 cmd: $NMCLI --pretty -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 2337 bytes +stdout: 2294 bytes >>> =============================================================================== Device details (wlan0) @@ -24,7 +24,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-076.expected b/clients/tests/test-client.check-on-disk/test_004-076.expected index 8798273ab9..223b0af5a8 100644 --- a/clients/tests/test-client.check-on-disk/test_004-076.expected +++ b/clients/tests/test-client.check-on-disk/test_004-076.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/76 cmd: $NMCLI --pretty -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2345 bytes +stdout: 2302 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -24,7 +24,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-077.expected b/clients/tests/test-client.check-on-disk/test_004-077.expected index d5d00f6cce..c3ec751926 100644 --- a/clients/tests/test-client.check-on-disk/test_004-077.expected +++ b/clients/tests/test-client.check-on-disk/test_004-077.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/77 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5734 bytes +stdout: 5691 bytes >>> =============================================================================== Device details (wlan0) @@ -77,7 +77,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-078.expected b/clients/tests/test-client.check-on-disk/test_004-078.expected index 8d7726a341..258583ebb2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-078.expected +++ b/clients/tests/test-client.check-on-disk/test_004-078.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/78 cmd: $NMCLI --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5784 bytes +stdout: 5741 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -77,7 +77,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-091.expected b/clients/tests/test-client.check-on-disk/test_004-091.expected index bfb9c93833..defcec34ba 100644 --- a/clients/tests/test-client.check-on-disk/test_004-091.expected +++ b/clients/tests/test-client.check-on-disk/test_004-091.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/91 cmd: $NMCLI --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2478 bytes +stdout: 2467 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -68,7 +68,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-092.expected b/clients/tests/test-client.check-on-disk/test_004-092.expected index 12b24d2e1d..038ece7fbc 100644 --- a/clients/tests/test-client.check-on-disk/test_004-092.expected +++ b/clients/tests/test-client.check-on-disk/test_004-092.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/92 cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2521 bytes +stdout: 2510 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -68,7 +68,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-093.expected b/clients/tests/test-client.check-on-disk/test_004-093.expected index 9859968972..e2f60bd4ef 100644 --- a/clients/tests/test-client.check-on-disk/test_004-093.expected +++ b/clients/tests/test-client.check-on-disk/test_004-093.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/93 cmd: $NMCLI --terse -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 750 bytes +stdout: 739 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,7 +14,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-094.expected b/clients/tests/test-client.check-on-disk/test_004-094.expected index d7a00c75ea..c5d03f83fb 100644 --- a/clients/tests/test-client.check-on-disk/test_004-094.expected +++ b/clients/tests/test-client.check-on-disk/test_004-094.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/94 cmd: $NMCLI --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 751 bytes +stdout: 740 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,7 +14,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-095.expected b/clients/tests/test-client.check-on-disk/test_004-095.expected index e6310e67fa..321f1dea3e 100644 --- a/clients/tests/test-client.check-on-disk/test_004-095.expected +++ b/clients/tests/test-client.check-on-disk/test_004-095.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/95 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2478 bytes +stdout: 2467 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -68,7 +68,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-096.expected b/clients/tests/test-client.check-on-disk/test_004-096.expected index 9b073844f3..6e144c2e52 100644 --- a/clients/tests/test-client.check-on-disk/test_004-096.expected +++ b/clients/tests/test-client.check-on-disk/test_004-096.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/96 cmd: $NMCLI --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2521 bytes +stdout: 2510 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -68,7 +68,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-163.expected b/clients/tests/test-client.check-on-disk/test_004-163.expected index f5b9fb6014..97071700c6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-163.expected +++ b/clients/tests/test-client.check-on-disk/test_004-163.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/163 cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: C returncode: 0 -stdout: 4643 bytes +stdout: 4600 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-164.expected b/clients/tests/test-client.check-on-disk/test_004-164.expected index 76c13dfe95..0d7d4a94e2 100644 --- a/clients/tests/test-client.check-on-disk/test_004-164.expected +++ b/clients/tests/test-client.check-on-disk/test_004-164.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/164 cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4686 bytes +stdout: 4643 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-165.expected b/clients/tests/test-client.check-on-disk/test_004-165.expected index c1ca58cd4d..835ee788d5 100644 --- a/clients/tests/test-client.check-on-disk/test_004-165.expected +++ b/clients/tests/test-client.check-on-disk/test_004-165.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/165 cmd: $NMCLI --mode multiline -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 1406 bytes +stdout: 1363 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -14,7 +14,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-166.expected b/clients/tests/test-client.check-on-disk/test_004-166.expected index add453618a..1cf58666f9 100644 --- a/clients/tests/test-client.check-on-disk/test_004-166.expected +++ b/clients/tests/test-client.check-on-disk/test_004-166.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/166 cmd: $NMCLI --mode multiline -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1407 bytes +stdout: 1364 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -14,7 +14,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-167.expected b/clients/tests/test-client.check-on-disk/test_004-167.expected index f74488999b..9b0da5af58 100644 --- a/clients/tests/test-client.check-on-disk/test_004-167.expected +++ b/clients/tests/test-client.check-on-disk/test_004-167.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/167 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 4643 bytes +stdout: 4600 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-168.expected b/clients/tests/test-client.check-on-disk/test_004-168.expected index bd580cc43d..f069b3379d 100644 --- a/clients/tests/test-client.check-on-disk/test_004-168.expected +++ b/clients/tests/test-client.check-on-disk/test_004-168.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/168 cmd: $NMCLI --mode multiline -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 4686 bytes +stdout: 4643 bytes >>> GENERAL.DEVICE: wlan0 GENERAL.TYPE: wifi @@ -68,7 +68,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-181.expected b/clients/tests/test-client.check-on-disk/test_004-181.expected index 3febb0eaae..b06035abf6 100644 --- a/clients/tests/test-client.check-on-disk/test_004-181.expected +++ b/clients/tests/test-client.check-on-disk/test_004-181.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/181 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: C returncode: 0 -stdout: 5734 bytes +stdout: 5691 bytes >>> =============================================================================== Device details (wlan0) @@ -77,7 +77,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-182.expected b/clients/tests/test-client.check-on-disk/test_004-182.expected index 8ecac668aa..ba3faf8d73 100644 --- a/clients/tests/test-client.check-on-disk/test_004-182.expected +++ b/clients/tests/test-client.check-on-disk/test_004-182.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/182 cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5784 bytes +stdout: 5741 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -77,7 +77,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-183.expected b/clients/tests/test-client.check-on-disk/test_004-183.expected index edfef5b6de..47e6409534 100644 --- a/clients/tests/test-client.check-on-disk/test_004-183.expected +++ b/clients/tests/test-client.check-on-disk/test_004-183.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/183 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 2337 bytes +stdout: 2294 bytes >>> =============================================================================== Device details (wlan0) @@ -24,7 +24,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-184.expected b/clients/tests/test-client.check-on-disk/test_004-184.expected index fa5ba8457b..dce0b55313 100644 --- a/clients/tests/test-client.check-on-disk/test_004-184.expected +++ b/clients/tests/test-client.check-on-disk/test_004-184.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/184 cmd: $NMCLI --mode multiline --pretty -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2345 bytes +stdout: 2302 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -24,7 +24,6 @@ GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveCo IP4.ADDRESS[1]: 192.168.228.18/32 IP4.ADDRESS[2]: 192.168.209.179/25 IP4.GATEWAY: 192.168.41.120 -IP4.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-185.expected b/clients/tests/test-client.check-on-disk/test_004-185.expected index 2b02ade2db..10507b66c4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-185.expected +++ b/clients/tests/test-client.check-on-disk/test_004-185.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/185 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 5734 bytes +stdout: 5691 bytes >>> =============================================================================== Device details (wlan0) @@ -77,7 +77,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-186.expected b/clients/tests/test-client.check-on-disk/test_004-186.expected index 8656a9b9d8..ff2cd4ba34 100644 --- a/clients/tests/test-client.check-on-disk/test_004-186.expected +++ b/clients/tests/test-client.check-on-disk/test_004-186.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/186 cmd: $NMCLI --mode multiline --pretty -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 5784 bytes +stdout: 5741 bytes >>> =============================================================================== Informacje o urządzeniu (wlan0) @@ -77,7 +77,6 @@ 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.ROUTE: -- IP4.DOMAIN[1]: sear4.foo2.bar IP4.DOMAIN[2]: sear4.fo.x.y IP4.DOMAIN[3]: sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-199.expected b/clients/tests/test-client.check-on-disk/test_004-199.expected index aebb130a0c..d4a69a04d3 100644 --- a/clients/tests/test-client.check-on-disk/test_004-199.expected +++ b/clients/tests/test-client.check-on-disk/test_004-199.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/199 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: C returncode: 0 -stdout: 2478 bytes +stdout: 2467 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -68,7 +68,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-200.expected b/clients/tests/test-client.check-on-disk/test_004-200.expected index a672d73881..0b3ddaa2fd 100644 --- a/clients/tests/test-client.check-on-disk/test_004-200.expected +++ b/clients/tests/test-client.check-on-disk/test_004-200.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1001:test_004()/200 cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2521 bytes +stdout: 2510 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -68,7 +68,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-201.expected b/clients/tests/test-client.check-on-disk/test_004-201.expected index 925c43c0fd..030273e296 100644 --- a/clients/tests/test-client.check-on-disk/test_004-201.expected +++ b/clients/tests/test-client.check-on-disk/test_004-201.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/201 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 lang: C returncode: 0 -stdout: 750 bytes +stdout: 739 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,7 +14,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-202.expected b/clients/tests/test-client.check-on-disk/test_004-202.expected index 8650e1b2d1..1113a46ea4 100644 --- a/clients/tests/test-client.check-on-disk/test_004-202.expected +++ b/clients/tests/test-client.check-on-disk/test_004-202.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1003:test_004()/202 cmd: $NMCLI --mode multiline --terse -f COMMON device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 751 bytes +stdout: 740 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -14,7 +14,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-203.expected b/clients/tests/test-client.check-on-disk/test_004-203.expected index 192e9d9856..c9d8ca14ed 100644 --- a/clients/tests/test-client.check-on-disk/test_004-203.expected +++ b/clients/tests/test-client.check-on-disk/test_004-203.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/203 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: C returncode: 0 -stdout: 2478 bytes +stdout: 2467 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -68,7 +68,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar diff --git a/clients/tests/test-client.check-on-disk/test_004-204.expected b/clients/tests/test-client.check-on-disk/test_004-204.expected index 9324d54bdb..ad38961658 100644 --- a/clients/tests/test-client.check-on-disk/test_004-204.expected +++ b/clients/tests/test-client.check-on-disk/test_004-204.expected @@ -2,7 +2,7 @@ location: clients/tests/test-client.py:1005:test_004()/204 cmd: $NMCLI --mode multiline --terse -f GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS device show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 2521 bytes +stdout: 2510 bytes >>> GENERAL.DEVICE:wlan0 GENERAL.TYPE:wifi @@ -68,7 +68,6 @@ 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.ROUTE: IP4.DOMAIN[1]:sear4.foo2.bar IP4.DOMAIN[2]:sear4.fo.x.y IP4.DOMAIN[3]:sear4.foo1.bar