diff --git a/clients/tests/test-client.check-on-disk/test_002.expected b/clients/tests/test-client.check-on-disk/test_002.expected index d1ca6af61e..013924947e 100644 --- a/clients/tests/test-client.check-on-disk/test_002.expected +++ b/clients/tests/test-client.check-on-disk/test_002.expected @@ -132,16 +132,8 @@ Strony podręcznika nmcli(1) i nmcli-examples(7) zawierają pełne informacje o użyciu. <<< -<<<<<<< HEAD -size: 1250 -location: clients/tests/test-client.py:863:test_002()/7 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1424 -location: clients/tests/test-client.py:863:test_002()/7 -======= -size: 1420 +size: 1246 location: clients/tests/test-client.py:test_002()/7 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 @@ -173,16 +165,8 @@ AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 <<< -<<<<<<< HEAD -size: 1287 -location: clients/tests/test-client.py:863:test_002()/8 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1461 -location: clients/tests/test-client.py:863:test_002()/8 -======= -size: 1457 +size: 1283 location: clients/tests/test-client.py:test_002()/8 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -214,16 +198,8 @@ AP[3].BARS: ** AP[3].SECURITY: WPA1 WPA2 <<< -<<<<<<< HEAD -size: 1704 -location: clients/tests/test-client.py:864:test_002()/9 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1878 -location: clients/tests/test-client.py:864:test_002()/9 -======= -size: 1874 +size: 1700 location: clients/tests/test-client.py:test_002()/9 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 @@ -261,16 +237,8 @@ AP[3].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 1749 -location: clients/tests/test-client.py:864:test_002()/10 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1923 -location: clients/tests/test-client.py:864:test_002()/10 -======= -size: 1919 +size: 1745 location: clients/tests/test-client.py:test_002()/10 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -308,16 +276,8 @@ AP[3].SECURITY: WPA1 WPA2 ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 581 -location: clients/tests/test-client.py:865:test_002()/11 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 671 -location: clients/tests/test-client.py:865:test_002()/11 -======= -size: 667 +size: 577 location: clients/tests/test-client.py:test_002()/11 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 @@ -349,16 +309,8 @@ AP[3].BARS:** AP[3].SECURITY:WPA1 WPA2 <<< -<<<<<<< HEAD -size: 618 -location: clients/tests/test-client.py:865:test_002()/12 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 708 -location: clients/tests/test-client.py:865:test_002()/12 -======= -size: 704 +size: 614 location: clients/tests/test-client.py:test_002()/12 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -390,16 +342,8 @@ AP[3].BARS:** AP[3].SECURITY:WPA1 WPA2 <<< -<<<<<<< HEAD -size: 455 -location: clients/tests/test-client.py:866:test_002()/13 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 531 -location: clients/tests/test-client.py:866:test_002()/13 -======= -size: 527 +size: 451 location: clients/tests/test-client.py:test_002()/13 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 @@ -411,16 +355,8 @@ AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1 AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2 <<< -<<<<<<< HEAD -size: 499 -location: clients/tests/test-client.py:866:test_002()/14 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 575 -location: clients/tests/test-client.py:866:test_002()/14 -======= -size: 571 +size: 495 location: clients/tests/test-client.py:test_002()/14 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -432,16 +368,8 @@ AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 44 ** WPA1 AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2 <<< -<<<<<<< HEAD -size: 614 -location: clients/tests/test-client.py:867:test_002()/15 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 709 -location: clients/tests/test-client.py:867:test_002()/15 -======= -size: 705 +size: 610 location: clients/tests/test-client.py:test_002()/15 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 @@ -457,16 +385,8 @@ AP[2] wlan0-ap-1 Infra 1 54 Mbit/s 44 ** WPA1 AP[3] wlan0-ap-2 Infra 1 54 Mbit/s 34 ** WPA1 WPA2 <<< -<<<<<<< HEAD -size: 694 -location: clients/tests/test-client.py:867:test_002()/16 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 789 -location: clients/tests/test-client.py:867:test_002()/16 -======= -size: 785 +size: 690 location: clients/tests/test-client.py:test_002()/16 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -482,16 +402,8 @@ AP[2] wlan0-ap-1 Infrastruktura 1 54 Mb/s 44 ** WPA1 AP[3] wlan0-ap-2 Infrastruktura 1 54 Mb/s 34 ** WPA1 WPA2 <<< -<<<<<<< HEAD -size: 309 -location: clients/tests/test-client.py:868:test_002()/17 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 378 -location: clients/tests/test-client.py:868:test_002()/17 -======= -size: 374 +size: 305 location: clients/tests/test-client.py:test_002()/17 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 @@ -502,16 +414,8 @@ AP[2]: :wlan0-ap-1:Infra:1:54 Mbit/s:44:** :WPA1 AP[3]: :wlan0-ap-2:Infra:1:54 Mbit/s:34:** :WPA1 WPA2 <<< -<<<<<<< HEAD -size: 346 -location: clients/tests/test-client.py:868:test_002()/18 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 415 -location: clients/tests/test-client.py:868:test_002()/18 -======= -size: 411 +size: 342 location: clients/tests/test-client.py:test_002()/18 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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_003.expected b/clients/tests/test-client.check-on-disk/test_003.expected index f4cae20949..18cab059d7 100644 --- a/clients/tests/test-client.check-on-disk/test_003.expected +++ b/clients/tests/test-client.check-on-disk/test_003.expected @@ -150,16 +150,8 @@ id path uuid <<< -<<<<<<< HEAD -size: 4116 -location: clients/tests/test-client.py:911:test_003()/12 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4159 -location: clients/tests/test-client.py:911:test_003()/12 -======= -size: 4155 +size: 4112 location: clients/tests/test-client.py:test_003()/12 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI con s con-gsm1 lang: C returncode: 0 @@ -255,16 +247,8 @@ proxy.pac-url: -- proxy.pac-script: -- <<< -<<<<<<< HEAD -size: 4145 -location: clients/tests/test-client.py:911:test_003()/13 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4189 -location: clients/tests/test-client.py:911:test_003()/13 -======= -size: 4185 +size: 4141 location: clients/tests/test-client.py:test_003()/13 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI con s con-gsm1 lang: pl_PL.UTF-8 returncode: 0 @@ -908,19 +892,9 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -<<<<<<< HEAD -size: 1459 -location: clients/tests/test-client.py:951:test_003()/31 -cmd: $NMCLI -f ALL dev s eth0 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1409 -location: clients/tests/test-client.py:951:test_003()/31 -cmd: $NMCLI -f ALL dev status -======= -size: 1405 +size: 1455 location: clients/tests/test-client.py:test_003()/31 -cmd: $NMCLI -f ALL dev status ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output +cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 stdout: 1272 bytes @@ -933,24 +907,14 @@ wlan1 wifi unavailable unknown unknown /org/freedesk wlan1 wifi unavailable unknown unknown /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< -<<<<<<< HEAD stderr: 24 bytes >>> Unknown parameter: eth0 <<< -size: 1474 -location: clients/tests/test-client.py:951:test_003()/32 -cmd: $NMCLI -f ALL dev s eth0 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1424 -location: clients/tests/test-client.py:951:test_003()/32 -cmd: $NMCLI -f ALL dev status -======= -size: 1420 +size: 1470 location: clients/tests/test-client.py:test_003()/32 -cmd: $NMCLI -f ALL dev status ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output +cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 stdout: 1277 bytes @@ -963,21 +927,13 @@ wlan1 wifi niedostępne nieznane nieznane /org/freedes wlan1 wifi niedostępne nieznane nieznane /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< -<<<<<<< HEAD stderr: 24 bytes >>> Nieznany parametr: eth0 <<< -size: 3494 -location: clients/tests/test-client.py:954:test_003()/33 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3494 -location: clients/tests/test-client.py:954:test_003()/33 -======= size: 3490 location: clients/tests/test-client.py:test_003()/33 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 @@ -1826,19 +1782,9 @@ GENERAL.ZONE: -- GENERAL.MASTER-PATH: -- <<< -<<<<<<< HEAD -size: 1459 -location: clients/tests/test-client.py:951:test_003()/54 -cmd: $NMCLI -f ALL dev s eth0 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1409 -location: clients/tests/test-client.py:951:test_003()/54 -cmd: $NMCLI -f ALL dev status -======= -size: 1405 +size: 1455 location: clients/tests/test-client.py:test_003()/54 -cmd: $NMCLI -f ALL dev status ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output +cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 stdout: 1272 bytes @@ -1851,24 +1797,14 @@ wlan1 wifi unavailable unknown unknown /org/freedesk wlan1 wifi unavailable unknown unknown /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< -<<<<<<< HEAD stderr: 24 bytes >>> Unknown parameter: eth0 <<< -size: 1474 -location: clients/tests/test-client.py:951:test_003()/55 -cmd: $NMCLI -f ALL dev s eth0 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1424 -location: clients/tests/test-client.py:951:test_003()/55 -cmd: $NMCLI -f ALL dev status -======= -size: 1420 +size: 1470 location: clients/tests/test-client.py:test_003()/55 -cmd: $NMCLI -f ALL dev status ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output +cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 stdout: 1277 bytes @@ -1881,21 +1817,13 @@ wlan1 wifi niedostępne nieznane nieznane /org/freedes wlan1 wifi niedostępne nieznane nieznane /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< -<<<<<<< HEAD stderr: 24 bytes >>> Nieznany parametr: eth0 <<< -size: 3494 -location: clients/tests/test-client.py:954:test_003()/56 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3494 -location: clients/tests/test-client.py:954:test_003()/56 -======= size: 3490 location: clients/tests/test-client.py:test_003()/56 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_004.expected b/clients/tests/test-client.check-on-disk/test_004.expected index 92efabe475..3db4d51043 100644 --- a/clients/tests/test-client.check-on-disk/test_004.expected +++ b/clients/tests/test-client.check-on-disk/test_004.expected @@ -1752,16 +1752,8 @@ IP6.DNS[1]: 2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]: sear6.fo.x.y <<< -<<<<<<< HEAD -size: 20789 -location: clients/tests/test-client.py:1063:test_004()/39 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 21150 -location: clients/tests/test-client.py:1063:test_004()/39 -======= -size: 21145 +size: 20784 location: clients/tests/test-client.py:test_004()/39 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f all dev show lang: C returncode: 0 @@ -2152,16 +2144,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 20942 -location: clients/tests/test-client.py:1063:test_004()/40 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 21306 -location: clients/tests/test-client.py:1063:test_004()/40 -======= -size: 21301 +size: 20937 location: clients/tests/test-client.py:test_004()/40 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -2618,16 +2602,8 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -<<<<<<< HEAD -size: 4890 -location: clients/tests/test-client.py:1069:test_004()/43 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5107 -location: clients/tests/test-client.py:1069:test_004()/43 -======= -size: 5102 +size: 4885 location: clients/tests/test-client.py:test_004()/43 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f all dev show wlan0 lang: C returncode: 0 @@ -2727,16 +2703,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4946 -location: clients/tests/test-client.py:1069:test_004()/44 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5164 -location: clients/tests/test-client.py:1069:test_004()/44 -======= -size: 5159 +size: 4941 location: clients/tests/test-client.py:test_004()/44 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -2836,16 +2804,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2003 -location: clients/tests/test-client.py:1072:test_004()/45 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2046 -location: clients/tests/test-client.py:1072:test_004()/45 -======= -size: 2041 +size: 1998 location: clients/tests/test-client.py:test_004()/45 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -2890,16 +2850,8 @@ WIFI-PROPERTIES.5GHZ: unknown WIFI-PROPERTIES.MESH: no <<< -<<<<<<< HEAD -size: 2028 -location: clients/tests/test-client.py:1072:test_004()/46 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2072 -location: clients/tests/test-client.py:1072:test_004()/46 -======= -size: 2067 +size: 2023 location: clients/tests/test-client.py:test_004()/46 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -2944,16 +2896,8 @@ WIFI-PROPERTIES.5GHZ: nieznane WIFI-PROPERTIES.MESH: nie <<< -<<<<<<< HEAD -size: 2003 -location: clients/tests/test-client.py:1075:test_004()/47 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2046 -location: clients/tests/test-client.py:1075:test_004()/47 -======= -size: 2041 +size: 1998 location: clients/tests/test-client.py:test_004()/47 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -2998,16 +2942,8 @@ WIFI-PROPERTIES.5GHZ: unknown WIFI-PROPERTIES.MESH: no <<< -<<<<<<< HEAD -size: 2028 -location: clients/tests/test-client.py:1075:test_004()/48 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2072 -location: clients/tests/test-client.py:1075:test_004()/48 -======= -size: 2067 +size: 2023 location: clients/tests/test-client.py:test_004()/48 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -3118,16 +3054,8 @@ AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH <<< -<<<<<<< HEAD -size: 618 -location: clients/tests/test-client.py:1083:test_004()/53 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 739 -location: clients/tests/test-client.py:1083:test_004()/53 -======= -size: 734 +size: 613 location: clients/tests/test-client.py:test_004()/53 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f COMMON device wifi list lang: C returncode: 0 @@ -3144,16 +3072,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 678 -location: clients/tests/test-client.py:1083:test_004()/54 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 799 -location: clients/tests/test-client.py:1083:test_004()/54 -======= -size: 794 +size: 673 location: clients/tests/test-client.py:test_004()/54 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -3232,16 +3152,8 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -<<<<<<< HEAD -size: 310 -location: clients/tests/test-client.py:1090:test_004()/59 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 348 -location: clients/tests/test-client.py:1090:test_004()/59 -======= -size: 343 +size: 305 location: clients/tests/test-client.py:test_004()/59 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -3253,16 +3165,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 336 -location: clients/tests/test-client.py:1090:test_004()/60 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 374 -location: clients/tests/test-client.py:1090:test_004()/60 -======= -size: 369 +size: 331 location: clients/tests/test-client.py:test_004()/60 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -3300,16 +3204,8 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -<<<<<<< HEAD -size: 4893 -location: clients/tests/test-client.py:1095:test_004()/63 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5110 -location: clients/tests/test-client.py:1095:test_004()/63 -======= -size: 5105 +size: 4888 location: clients/tests/test-client.py:test_004()/63 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f ALL device show wlan0 lang: C returncode: 0 @@ -3409,16 +3305,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4949 -location: clients/tests/test-client.py:1095:test_004()/64 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5167 -location: clients/tests/test-client.py:1095:test_004()/64 -======= -size: 5162 +size: 4944 location: clients/tests/test-client.py:test_004()/64 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -3584,16 +3472,8 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -<<<<<<< HEAD -size: 5031 -location: clients/tests/test-client.py:1099:test_004()/67 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5248 -location: clients/tests/test-client.py:1099:test_004()/67 -======= -size: 5243 +size: 5026 location: clients/tests/test-client.py:test_004()/67 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -3693,16 +3573,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 5087 -location: clients/tests/test-client.py:1099:test_004()/68 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5305 -location: clients/tests/test-client.py:1099:test_004()/68 -======= -size: 5300 +size: 5082 location: clients/tests/test-client.py:test_004()/68 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -4876,16 +4748,8 @@ IP6.DNS[1]: 2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]: sear6.fo.x.y <<< -<<<<<<< HEAD -size: 21089 -location: clients/tests/test-client.py:1063:test_004()/87 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 21486 -location: clients/tests/test-client.py:1063:test_004()/87 -======= -size: 21481 +size: 21084 location: clients/tests/test-client.py:test_004()/87 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f all dev show lang: C returncode: 0 @@ -5276,16 +5140,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 21242 -location: clients/tests/test-client.py:1063:test_004()/88 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 21642 -location: clients/tests/test-client.py:1063:test_004()/88 -======= -size: 21637 +size: 21237 location: clients/tests/test-client.py:test_004()/88 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -5742,16 +5598,8 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -<<<<<<< HEAD -size: 5118 -location: clients/tests/test-client.py:1069:test_004()/91 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5362 -location: clients/tests/test-client.py:1069:test_004()/91 -======= -size: 5357 +size: 5113 location: clients/tests/test-client.py:test_004()/91 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -5851,16 +5699,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 5174 -location: clients/tests/test-client.py:1069:test_004()/92 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5419 -location: clients/tests/test-client.py:1069:test_004()/92 -======= -size: 5414 +size: 5169 location: clients/tests/test-client.py:test_004()/92 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -5960,16 +5800,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2015 -location: clients/tests/test-client.py:1072:test_004()/93 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2058 -location: clients/tests/test-client.py:1072:test_004()/93 -======= -size: 2053 +size: 2010 location: clients/tests/test-client.py:test_004()/93 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -6014,16 +5846,8 @@ WIFI-PROPERTIES.5GHZ: unknown WIFI-PROPERTIES.MESH: no <<< -<<<<<<< HEAD -size: 2040 -location: clients/tests/test-client.py:1072:test_004()/94 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2084 -location: clients/tests/test-client.py:1072:test_004()/94 -======= -size: 2079 +size: 2035 location: clients/tests/test-client.py:test_004()/94 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -6068,16 +5892,8 @@ WIFI-PROPERTIES.5GHZ: nieznane WIFI-PROPERTIES.MESH: nie <<< -<<<<<<< HEAD -size: 2015 -location: clients/tests/test-client.py:1075:test_004()/95 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2058 -location: clients/tests/test-client.py:1075:test_004()/95 -======= -size: 2053 +size: 2010 location: clients/tests/test-client.py:test_004()/95 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -6122,16 +5938,8 @@ WIFI-PROPERTIES.5GHZ: unknown WIFI-PROPERTIES.MESH: no <<< -<<<<<<< HEAD -size: 2040 -location: clients/tests/test-client.py:1075:test_004()/96 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2084 -location: clients/tests/test-client.py:1075:test_004()/96 -======= -size: 2079 +size: 2035 location: clients/tests/test-client.py:test_004()/96 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -6242,16 +6050,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH <<< -<<<<<<< HEAD -size: 919 -location: clients/tests/test-client.py:1083:test_004()/101 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1076 -location: clients/tests/test-client.py:1083:test_004()/101 -======= -size: 1071 +size: 914 location: clients/tests/test-client.py:test_004()/101 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -6268,16 +6068,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 979 -location: clients/tests/test-client.py:1083:test_004()/102 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1136 -location: clients/tests/test-client.py:1083:test_004()/102 -======= -size: 1131 +size: 974 location: clients/tests/test-client.py:test_004()/102 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -6356,16 +6148,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -<<<<<<< HEAD -size: 395 -location: clients/tests/test-client.py:1090:test_004()/107 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 442 -location: clients/tests/test-client.py:1090:test_004()/107 -======= -size: 437 +size: 390 location: clients/tests/test-client.py:test_004()/107 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -6377,16 +6161,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 421 -location: clients/tests/test-client.py:1090:test_004()/108 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 468 -location: clients/tests/test-client.py:1090:test_004()/108 -======= -size: 463 +size: 416 location: clients/tests/test-client.py:test_004()/108 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -6424,16 +6200,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -<<<<<<< HEAD -size: 5122 -location: clients/tests/test-client.py:1095:test_004()/111 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5366 -location: clients/tests/test-client.py:1095:test_004()/111 -======= -size: 5361 +size: 5117 location: clients/tests/test-client.py:test_004()/111 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -6533,16 +6301,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 5178 -location: clients/tests/test-client.py:1095:test_004()/112 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5423 -location: clients/tests/test-client.py:1095:test_004()/112 -======= -size: 5418 +size: 5173 location: clients/tests/test-client.py:test_004()/112 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -6708,16 +6468,8 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -<<<<<<< HEAD -size: 5260 -location: clients/tests/test-client.py:1099:test_004()/115 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5504 -location: clients/tests/test-client.py:1099:test_004()/115 -======= -size: 5499 +size: 5255 location: clients/tests/test-client.py:test_004()/115 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -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 @@ -6817,16 +6569,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 5316 -location: clients/tests/test-client.py:1099:test_004()/116 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5561 -location: clients/tests/test-client.py:1099:test_004()/116 -======= -size: 5556 +size: 5311 location: clients/tests/test-client.py:test_004()/116 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --color yes -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 @@ -8224,16 +7968,8 @@ IP6.DOMAIN[1]: sear6.fo.x.y ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 25374 -location: clients/tests/test-client.py:1063:test_004()/135 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 25735 -location: clients/tests/test-client.py:1063:test_004()/135 -======= -size: 25730 +size: 25369 location: clients/tests/test-client.py:test_004()/135 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f all dev show lang: C returncode: 0 @@ -8683,16 +8419,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 25560 -location: clients/tests/test-client.py:1063:test_004()/136 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 25924 -location: clients/tests/test-client.py:1063:test_004()/136 -======= -size: 25919 +size: 25555 location: clients/tests/test-client.py:test_004()/136 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -9232,16 +8960,8 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 5991 -location: clients/tests/test-client.py:1069:test_004()/139 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6208 -location: clients/tests/test-client.py:1069:test_004()/139 -======= -size: 6203 +size: 5986 location: clients/tests/test-client.py:test_004()/139 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f all dev show wlan0 lang: C returncode: 0 @@ -9355,16 +9075,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6054 -location: clients/tests/test-client.py:1069:test_004()/140 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6272 -location: clients/tests/test-client.py:1069:test_004()/140 -======= -size: 6267 +size: 6049 location: clients/tests/test-client.py:test_004()/140 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9478,16 +9190,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2464 -location: clients/tests/test-client.py:1072:test_004()/141 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2507 -location: clients/tests/test-client.py:1072:test_004()/141 -======= -size: 2502 +size: 2459 location: clients/tests/test-client.py:test_004()/141 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -9538,16 +9242,8 @@ WIFI-PROPERTIES.MESH: no ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2496 -location: clients/tests/test-client.py:1072:test_004()/142 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2540 -location: clients/tests/test-client.py:1072:test_004()/142 -======= -size: 2535 +size: 2491 location: clients/tests/test-client.py:test_004()/142 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9598,16 +9294,8 @@ WIFI-PROPERTIES.MESH: nie ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2464 -location: clients/tests/test-client.py:1075:test_004()/143 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2507 -location: clients/tests/test-client.py:1075:test_004()/143 -======= -size: 2502 +size: 2459 location: clients/tests/test-client.py:test_004()/143 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -9658,16 +9346,8 @@ WIFI-PROPERTIES.MESH: no ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2496 -location: clients/tests/test-client.py:1075:test_004()/144 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2540 -location: clients/tests/test-client.py:1075:test_004()/144 -======= -size: 2535 +size: 2491 location: clients/tests/test-client.py:test_004()/144 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -9816,16 +9496,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ <<< -<<<<<<< HEAD -size: 1152 -location: clients/tests/test-client.py:1083:test_004()/149 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1319 -location: clients/tests/test-client.py:1083:test_004()/149 -======= -size: 1314 +size: 1147 location: clients/tests/test-client.py:test_004()/149 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f COMMON device wifi list lang: C returncode: 0 @@ -9854,16 +9526,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ----------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 1383 -location: clients/tests/test-client.py:1083:test_004()/150 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1549 -location: clients/tests/test-client.py:1083:test_004()/150 -======= -size: 1544 +size: 1378 location: clients/tests/test-client.py:test_004()/150 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -9986,16 +9650,8 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -<<<<<<< HEAD -size: 499 -location: clients/tests/test-client.py:1090:test_004()/155 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 556 -location: clients/tests/test-client.py:1090:test_004()/155 -======= -size: 551 +size: 494 location: clients/tests/test-client.py:test_004()/155 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -10011,16 +9667,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 584 -location: clients/tests/test-client.py:1090:test_004()/156 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 641 -location: clients/tests/test-client.py:1090:test_004()/156 -======= -size: 636 +size: 579 location: clients/tests/test-client.py:test_004()/156 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -10070,16 +9718,8 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -<<<<<<< HEAD -size: 5994 -location: clients/tests/test-client.py:1095:test_004()/159 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6211 -location: clients/tests/test-client.py:1095:test_004()/159 -======= -size: 6206 +size: 5989 location: clients/tests/test-client.py:test_004()/159 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f ALL device show wlan0 lang: C returncode: 0 @@ -10193,16 +9833,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6057 -location: clients/tests/test-client.py:1095:test_004()/160 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6275 -location: clients/tests/test-client.py:1095:test_004()/160 -======= -size: 6270 +size: 6052 location: clients/tests/test-client.py:test_004()/160 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -10406,16 +10038,8 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6132 -location: clients/tests/test-client.py:1099:test_004()/163 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6349 -location: clients/tests/test-client.py:1099:test_004()/163 -======= -size: 6344 +size: 6127 location: clients/tests/test-client.py:test_004()/163 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -10529,16 +10153,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6195 -location: clients/tests/test-client.py:1099:test_004()/164 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6413 -location: clients/tests/test-client.py:1099:test_004()/164 -======= -size: 6408 +size: 6190 location: clients/tests/test-client.py:test_004()/164 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -11962,16 +11578,8 @@ IP6.DOMAIN[1]: sear6.fo.x.y ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 25674 -location: clients/tests/test-client.py:1063:test_004()/183 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 26071 -location: clients/tests/test-client.py:1063:test_004()/183 -======= -size: 26066 +size: 25669 location: clients/tests/test-client.py:test_004()/183 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f all dev show lang: C returncode: 0 @@ -12421,16 +12029,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 25860 -location: clients/tests/test-client.py:1063:test_004()/184 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 26260 -location: clients/tests/test-client.py:1063:test_004()/184 -======= -size: 26255 +size: 25855 location: clients/tests/test-client.py:test_004()/184 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -12970,16 +12570,8 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6219 -location: clients/tests/test-client.py:1069:test_004()/187 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6463 -location: clients/tests/test-client.py:1069:test_004()/187 -======= -size: 6458 +size: 6214 location: clients/tests/test-client.py:test_004()/187 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -13093,16 +12685,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6282 -location: clients/tests/test-client.py:1069:test_004()/188 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6527 -location: clients/tests/test-client.py:1069:test_004()/188 -======= -size: 6522 +size: 6277 location: clients/tests/test-client.py:test_004()/188 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -13216,16 +12800,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2476 -location: clients/tests/test-client.py:1072:test_004()/189 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2519 -location: clients/tests/test-client.py:1072:test_004()/189 -======= -size: 2514 +size: 2471 location: clients/tests/test-client.py:test_004()/189 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -13276,16 +12852,8 @@ WIFI-PROPERTIES.MESH: no ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2508 -location: clients/tests/test-client.py:1072:test_004()/190 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2552 -location: clients/tests/test-client.py:1072:test_004()/190 -======= -size: 2547 +size: 2503 location: clients/tests/test-client.py:test_004()/190 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -13336,16 +12904,8 @@ WIFI-PROPERTIES.MESH: nie ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2476 -location: clients/tests/test-client.py:1075:test_004()/191 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2519 -location: clients/tests/test-client.py:1075:test_004()/191 -======= -size: 2514 +size: 2471 location: clients/tests/test-client.py:test_004()/191 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -13396,16 +12956,8 @@ WIFI-PROPERTIES.MESH: no ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2508 -location: clients/tests/test-client.py:1075:test_004()/192 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2552 -location: clients/tests/test-client.py:1075:test_004()/192 -======= -size: 2547 +size: 2503 location: clients/tests/test-client.py:test_004()/192 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -13554,16 +13106,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ <<< -<<<<<<< HEAD -size: 1453 -location: clients/tests/test-client.py:1083:test_004()/197 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1655 -location: clients/tests/test-client.py:1083:test_004()/197 -======= -size: 1650 +size: 1448 location: clients/tests/test-client.py:test_004()/197 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -13592,16 +13136,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ----------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 1683 -location: clients/tests/test-client.py:1083:test_004()/198 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1885 -location: clients/tests/test-client.py:1083:test_004()/198 -======= -size: 1880 +size: 1678 location: clients/tests/test-client.py:test_004()/198 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -13724,16 +13260,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -<<<<<<< HEAD -size: 583 -location: clients/tests/test-client.py:1090:test_004()/203 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 649 -location: clients/tests/test-client.py:1090:test_004()/203 -======= -size: 644 +size: 578 location: clients/tests/test-client.py:test_004()/203 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -13749,16 +13277,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 668 -location: clients/tests/test-client.py:1090:test_004()/204 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 734 -location: clients/tests/test-client.py:1090:test_004()/204 -======= -size: 729 +size: 663 location: clients/tests/test-client.py:test_004()/204 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -13808,16 +13328,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -<<<<<<< HEAD -size: 6222 -location: clients/tests/test-client.py:1095:test_004()/207 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6466 -location: clients/tests/test-client.py:1095:test_004()/207 -======= -size: 6461 +size: 6217 location: clients/tests/test-client.py:test_004()/207 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -13931,16 +13443,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6285 -location: clients/tests/test-client.py:1095:test_004()/208 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6530 -location: clients/tests/test-client.py:1095:test_004()/208 -======= -size: 6525 +size: 6280 location: clients/tests/test-client.py:test_004()/208 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -14144,16 +13648,8 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6360 -location: clients/tests/test-client.py:1099:test_004()/211 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6604 -location: clients/tests/test-client.py:1099:test_004()/211 -======= -size: 6599 +size: 6355 location: clients/tests/test-client.py:test_004()/211 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -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 @@ -14267,16 +13763,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6423 -location: clients/tests/test-client.py:1099:test_004()/212 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6668 -location: clients/tests/test-client.py:1099:test_004()/212 -======= -size: 6663 +size: 6418 location: clients/tests/test-client.py:test_004()/212 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --pretty --color yes -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 @@ -15472,16 +14960,8 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]:sear6.fo.x.y <<< -<<<<<<< HEAD -size: 11999 -location: clients/tests/test-client.py:1063:test_004()/231 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 12203 -location: clients/tests/test-client.py:1063:test_004()/231 -======= -size: 12198 +size: 11994 location: clients/tests/test-client.py:test_004()/231 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f all dev show lang: C returncode: 0 @@ -15872,16 +15352,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 12045 -location: clients/tests/test-client.py:1063:test_004()/232 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 12249 -location: clients/tests/test-client.py:1063:test_004()/232 -======= -size: 12244 +size: 12040 location: clients/tests/test-client.py:test_004()/232 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -16338,16 +15810,8 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -<<<<<<< HEAD -size: 2717 -location: clients/tests/test-client.py:1069:test_004()/235 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2835 -location: clients/tests/test-client.py:1069:test_004()/235 -======= -size: 2830 +size: 2712 location: clients/tests/test-client.py:test_004()/235 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f all dev show wlan0 lang: C returncode: 0 @@ -16447,16 +15911,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2754 -location: clients/tests/test-client.py:1069:test_004()/236 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2872 -location: clients/tests/test-client.py:1069:test_004()/236 -======= -size: 2867 +size: 2749 location: clients/tests/test-client.py:test_004()/236 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -16556,16 +16012,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1215 -location: clients/tests/test-client.py:1072:test_004()/237 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1243 -location: clients/tests/test-client.py:1072:test_004()/237 -======= -size: 1238 +size: 1210 location: clients/tests/test-client.py:test_004()/237 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -16610,16 +16058,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1225 -location: clients/tests/test-client.py:1072:test_004()/238 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1253 -location: clients/tests/test-client.py:1072:test_004()/238 -======= -size: 1248 +size: 1220 location: clients/tests/test-client.py:test_004()/238 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -16664,16 +16104,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1215 -location: clients/tests/test-client.py:1075:test_004()/239 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1243 -location: clients/tests/test-client.py:1075:test_004()/239 -======= -size: 1238 +size: 1210 location: clients/tests/test-client.py:test_004()/239 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -16718,16 +16150,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1225 -location: clients/tests/test-client.py:1075:test_004()/240 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1253 -location: clients/tests/test-client.py:1075:test_004()/240 -======= -size: 1248 +size: 1220 location: clients/tests/test-client.py:test_004()/240 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -16830,16 +16254,8 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24 <<< -<<<<<<< HEAD -size: 343 -location: clients/tests/test-client.py:1083:test_004()/245 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 435 -location: clients/tests/test-client.py:1083:test_004()/245 -======= -size: 430 +size: 338 location: clients/tests/test-client.py:test_004()/245 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f COMMON device wifi list lang: C returncode: 0 @@ -16853,16 +16269,8 @@ stdout: 188 bytes <<< -<<<<<<< HEAD -size: 389 -location: clients/tests/test-client.py:1083:test_004()/246 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 481 -location: clients/tests/test-client.py:1083:test_004()/246 -======= -size: 476 +size: 384 location: clients/tests/test-client.py:test_004()/246 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -16930,16 +16338,8 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< -<<<<<<< HEAD -size: 229 -location: clients/tests/test-client.py:1090:test_004()/251 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 252 -location: clients/tests/test-client.py:1090:test_004()/251 -======= -size: 247 +size: 224 location: clients/tests/test-client.py:test_004()/251 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -16950,16 +16350,8 @@ stdout: 51 bytes <<< -<<<<<<< HEAD -size: 248 -location: clients/tests/test-client.py:1090:test_004()/252 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 271 -location: clients/tests/test-client.py:1090:test_004()/252 -======= -size: 266 +size: 243 location: clients/tests/test-client.py:test_004()/252 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -16994,16 +16386,8 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< -<<<<<<< HEAD -size: 2720 -location: clients/tests/test-client.py:1095:test_004()/255 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2838 -location: clients/tests/test-client.py:1095:test_004()/255 -======= -size: 2833 +size: 2715 location: clients/tests/test-client.py:test_004()/255 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f ALL device show wlan0 lang: C returncode: 0 @@ -17103,16 +16487,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2757 -location: clients/tests/test-client.py:1095:test_004()/256 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2875 -location: clients/tests/test-client.py:1095:test_004()/256 -======= -size: 2870 +size: 2752 location: clients/tests/test-client.py:test_004()/256 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -17278,16 +16654,8 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -<<<<<<< HEAD -size: 2858 -location: clients/tests/test-client.py:1099:test_004()/259 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2976 -location: clients/tests/test-client.py:1099:test_004()/259 -======= -size: 2971 +size: 2853 location: clients/tests/test-client.py:test_004()/259 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -17387,16 +16755,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2895 -location: clients/tests/test-client.py:1099:test_004()/260 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3013 -location: clients/tests/test-client.py:1099:test_004()/260 -======= -size: 3008 +size: 2890 location: clients/tests/test-client.py:test_004()/260 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -18566,16 +17926,8 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]:sear6.fo.x.y <<< -<<<<<<< HEAD -size: 12299 -location: clients/tests/test-client.py:1063:test_004()/279 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 12539 -location: clients/tests/test-client.py:1063:test_004()/279 -======= -size: 12534 +size: 12294 location: clients/tests/test-client.py:test_004()/279 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f all dev show lang: C returncode: 0 @@ -18966,16 +18318,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 12345 -location: clients/tests/test-client.py:1063:test_004()/280 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 12585 -location: clients/tests/test-client.py:1063:test_004()/280 -======= -size: 12580 +size: 12340 location: clients/tests/test-client.py:test_004()/280 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -19432,16 +18776,8 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -<<<<<<< HEAD -size: 2945 -location: clients/tests/test-client.py:1069:test_004()/283 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3090 -location: clients/tests/test-client.py:1069:test_004()/283 -======= -size: 3085 +size: 2940 location: clients/tests/test-client.py:test_004()/283 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -19541,16 +18877,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2982 -location: clients/tests/test-client.py:1069:test_004()/284 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3127 -location: clients/tests/test-client.py:1069:test_004()/284 -======= -size: 3122 +size: 2977 location: clients/tests/test-client.py:test_004()/284 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -19650,16 +18978,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1227 -location: clients/tests/test-client.py:1072:test_004()/285 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1255 -location: clients/tests/test-client.py:1072:test_004()/285 -======= -size: 1250 +size: 1222 location: clients/tests/test-client.py:test_004()/285 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -19704,16 +19024,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1237 -location: clients/tests/test-client.py:1072:test_004()/286 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1265 -location: clients/tests/test-client.py:1072:test_004()/286 -======= -size: 1260 +size: 1232 location: clients/tests/test-client.py:test_004()/286 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -19758,16 +19070,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1227 -location: clients/tests/test-client.py:1075:test_004()/287 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1255 -location: clients/tests/test-client.py:1075:test_004()/287 -======= -size: 1250 +size: 1222 location: clients/tests/test-client.py:test_004()/287 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -19812,16 +19116,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1237 -location: clients/tests/test-client.py:1075:test_004()/288 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1265 -location: clients/tests/test-client.py:1075:test_004()/288 -======= -size: 1260 +size: 1232 location: clients/tests/test-client.py:test_004()/288 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -19924,16 +19220,8 @@ stdout: 1594 bytes <<< -<<<<<<< HEAD -size: 643 -location: clients/tests/test-client.py:1083:test_004()/293 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 771 -location: clients/tests/test-client.py:1083:test_004()/293 -======= -size: 766 +size: 638 location: clients/tests/test-client.py:test_004()/293 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -19947,16 +19235,8 @@ stdout: 476 bytes <<< -<<<<<<< HEAD -size: 689 -location: clients/tests/test-client.py:1083:test_004()/294 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 817 -location: clients/tests/test-client.py:1083:test_004()/294 -======= -size: 812 +size: 684 location: clients/tests/test-client.py:test_004()/294 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -20024,16 +19304,8 @@ stdout: 422 bytes <<< -<<<<<<< HEAD -size: 314 -location: clients/tests/test-client.py:1090:test_004()/299 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 346 -location: clients/tests/test-client.py:1090:test_004()/299 -======= -size: 341 +size: 309 location: clients/tests/test-client.py:test_004()/299 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -20044,16 +19316,8 @@ stdout: 123 bytes <<< -<<<<<<< HEAD -size: 333 -location: clients/tests/test-client.py:1090:test_004()/300 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 365 -location: clients/tests/test-client.py:1090:test_004()/300 -======= -size: 360 +size: 328 location: clients/tests/test-client.py:test_004()/300 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -20088,16 +19352,8 @@ stdout: 422 bytes <<< -<<<<<<< HEAD -size: 2948 -location: clients/tests/test-client.py:1095:test_004()/303 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3093 -location: clients/tests/test-client.py:1095:test_004()/303 -======= -size: 3088 +size: 2943 location: clients/tests/test-client.py:test_004()/303 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -20197,16 +19453,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2985 -location: clients/tests/test-client.py:1095:test_004()/304 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3130 -location: clients/tests/test-client.py:1095:test_004()/304 -======= -size: 3125 +size: 2980 location: clients/tests/test-client.py:test_004()/304 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -20372,16 +19620,8 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -<<<<<<< HEAD -size: 3086 -location: clients/tests/test-client.py:1099:test_004()/307 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3231 -location: clients/tests/test-client.py:1099:test_004()/307 -======= -size: 3226 +size: 3081 location: clients/tests/test-client.py:test_004()/307 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -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 @@ -20481,16 +19721,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 3123 -location: clients/tests/test-client.py:1099:test_004()/308 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3268 -location: clients/tests/test-client.py:1099:test_004()/308 -======= -size: 3263 +size: 3118 location: clients/tests/test-client.py:test_004()/308 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --terse --color yes -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 @@ -21216,16 +20448,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = :: 2001:a::2934:bd66:550d:ec19 sear6.fo.x.y <<< -<<<<<<< HEAD -size: 14897 -location: clients/tests/test-client.py:1063:test_004()/327 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 15078 -location: clients/tests/test-client.py:1063:test_004()/327 -======= -size: 15073 +size: 14892 location: clients/tests/test-client.py:test_004()/327 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f all dev show lang: C returncode: 0 @@ -21362,16 +20586,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 15056 -location: clients/tests/test-client.py:1063:test_004()/328 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 15237 -location: clients/tests/test-client.py:1063:test_004()/328 -======= -size: 15232 +size: 15051 location: clients/tests/test-client.py:test_004()/328 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -21578,16 +20794,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 3024 -location: clients/tests/test-client.py:1069:test_004()/331 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3120 -location: clients/tests/test-client.py:1069:test_004()/331 -======= -size: 3115 +size: 3019 location: clients/tests/test-client.py:test_004()/331 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f all dev show wlan0 lang: C returncode: 0 @@ -21623,16 +20831,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 3087 -location: clients/tests/test-client.py:1069:test_004()/332 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3183 -location: clients/tests/test-client.py:1069:test_004()/332 -======= -size: 3178 +size: 3082 location: clients/tests/test-client.py:test_004()/332 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -21668,16 +20868,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1263 -location: clients/tests/test-client.py:1072:test_004()/333 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1283 -location: clients/tests/test-client.py:1072:test_004()/333 -======= -size: 1278 +size: 1258 location: clients/tests/test-client.py:test_004()/333 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -21693,16 +20885,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< -<<<<<<< HEAD -size: 1290 -location: clients/tests/test-client.py:1072:test_004()/334 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1310 -location: clients/tests/test-client.py:1072:test_004()/334 -======= -size: 1305 +size: 1285 location: clients/tests/test-client.py:test_004()/334 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -21718,16 +20902,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MES WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< -<<<<<<< HEAD -size: 1263 -location: clients/tests/test-client.py:1075:test_004()/335 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1283 -location: clients/tests/test-client.py:1075:test_004()/335 -======= -size: 1278 +size: 1258 location: clients/tests/test-client.py:test_004()/335 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -21743,16 +20919,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< -<<<<<<< HEAD -size: 1290 -location: clients/tests/test-client.py:1075:test_004()/336 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1310 -location: clients/tests/test-client.py:1075:test_004()/336 -======= -size: 1305 +size: 1285 location: clients/tests/test-client.py:test_004()/336 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -21834,16 +21002,8 @@ AP[1] wlan1-ap-4 776C616E312D61702D34 94:2B:E8:F6:D2:86 Infrastruktura 1 NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH <<< -<<<<<<< HEAD -size: 634 -location: clients/tests/test-client.py:1083:test_004()/341 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 755 -location: clients/tests/test-client.py:1083:test_004()/341 -======= -size: 750 +size: 629 location: clients/tests/test-client.py:test_004()/341 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f COMMON device wifi list lang: C returncode: 0 @@ -21860,16 +21020,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 694 -location: clients/tests/test-client.py:1083:test_004()/342 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 815 -location: clients/tests/test-client.py:1083:test_004()/342 -======= -size: 810 +size: 689 location: clients/tests/test-client.py:test_004()/342 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -21948,16 +21100,8 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -<<<<<<< HEAD -size: 326 -location: clients/tests/test-client.py:1090:test_004()/347 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 364 -location: clients/tests/test-client.py:1090:test_004()/347 -======= -size: 359 +size: 321 location: clients/tests/test-client.py:test_004()/347 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -21969,16 +21113,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 352 -location: clients/tests/test-client.py:1090:test_004()/348 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 390 -location: clients/tests/test-client.py:1090:test_004()/348 -======= -size: 385 +size: 347 location: clients/tests/test-client.py:test_004()/348 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -22016,16 +21152,8 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -<<<<<<< HEAD -size: 3027 -location: clients/tests/test-client.py:1095:test_004()/351 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3123 -location: clients/tests/test-client.py:1095:test_004()/351 -======= -size: 3118 +size: 3022 location: clients/tests/test-client.py:test_004()/351 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: C returncode: 0 @@ -22061,16 +21189,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 3090 -location: clients/tests/test-client.py:1095:test_004()/352 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3186 -location: clients/tests/test-client.py:1095:test_004()/352 -======= -size: 3181 +size: 3085 location: clients/tests/test-client.py:test_004()/352 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -22176,16 +21296,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 3165 -location: clients/tests/test-client.py:1099:test_004()/355 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3261 -location: clients/tests/test-client.py:1099:test_004()/355 -======= -size: 3256 +size: 3160 location: clients/tests/test-client.py:test_004()/355 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -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 @@ -22221,16 +21333,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 3228 -location: clients/tests/test-client.py:1099:test_004()/356 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3324 -location: clients/tests/test-client.py:1099:test_004()/356 -======= -size: 3319 +size: 3223 location: clients/tests/test-client.py:test_004()/356 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular -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 @@ -22858,16 +21962,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = :: 2001:a::2934:bd66:550d:ec19 sear6.fo.x.y <<< -<<<<<<< HEAD -size: 15233 -location: clients/tests/test-client.py:1063:test_004()/375 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 15450 -location: clients/tests/test-client.py:1063:test_004()/375 -======= -size: 15445 +size: 15228 location: clients/tests/test-client.py:test_004()/375 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f all dev show lang: C returncode: 0 @@ -23004,16 +22100,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 15392 -location: clients/tests/test-client.py:1063:test_004()/376 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 15609 -location: clients/tests/test-client.py:1063:test_004()/376 -======= -size: 15604 +size: 15387 location: clients/tests/test-client.py:test_004()/376 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -23220,16 +22308,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 3279 -location: clients/tests/test-client.py:1069:test_004()/379 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3402 -location: clients/tests/test-client.py:1069:test_004()/379 -======= -size: 3397 +size: 3274 location: clients/tests/test-client.py:test_004()/379 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -23265,16 +22345,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 3342 -location: clients/tests/test-client.py:1069:test_004()/380 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3465 -location: clients/tests/test-client.py:1069:test_004()/380 -======= -size: 3460 +size: 3337 location: clients/tests/test-client.py:test_004()/380 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23310,16 +22382,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1275 -location: clients/tests/test-client.py:1072:test_004()/381 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1295 -location: clients/tests/test-client.py:1072:test_004()/381 -======= -size: 1290 +size: 1270 location: clients/tests/test-client.py:test_004()/381 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -23335,16 +22399,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< -<<<<<<< HEAD -size: 1302 -location: clients/tests/test-client.py:1072:test_004()/382 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1322 -location: clients/tests/test-client.py:1072:test_004()/382 -======= -size: 1317 +size: 1297 location: clients/tests/test-client.py:test_004()/382 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23360,16 +22416,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MES WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< -<<<<<<< HEAD -size: 1275 -location: clients/tests/test-client.py:1075:test_004()/383 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1295 -location: clients/tests/test-client.py:1075:test_004()/383 -======= -size: 1290 +size: 1270 location: clients/tests/test-client.py:test_004()/383 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -23385,16 +22433,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< -<<<<<<< HEAD -size: 1302 -location: clients/tests/test-client.py:1075:test_004()/384 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1322 -location: clients/tests/test-client.py:1075:test_004()/384 -======= -size: 1317 +size: 1297 location: clients/tests/test-client.py:test_004()/384 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23476,16 +22516,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH <<< -<<<<<<< HEAD -size: 934 -location: clients/tests/test-client.py:1083:test_004()/389 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1091 -location: clients/tests/test-client.py:1083:test_004()/389 -======= -size: 1086 +size: 929 location: clients/tests/test-client.py:test_004()/389 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -23502,16 +22534,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 994 -location: clients/tests/test-client.py:1083:test_004()/390 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1151 -location: clients/tests/test-client.py:1083:test_004()/390 -======= -size: 1146 +size: 989 location: clients/tests/test-client.py:test_004()/390 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -23590,16 +22614,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -<<<<<<< HEAD -size: 410 -location: clients/tests/test-client.py:1090:test_004()/395 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 457 -location: clients/tests/test-client.py:1090:test_004()/395 -======= -size: 452 +size: 405 location: clients/tests/test-client.py:test_004()/395 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -23611,16 +22627,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 436 -location: clients/tests/test-client.py:1090:test_004()/396 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 483 -location: clients/tests/test-client.py:1090:test_004()/396 -======= -size: 478 +size: 431 location: clients/tests/test-client.py:test_004()/396 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -23658,16 +22666,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -<<<<<<< HEAD -size: 3282 -location: clients/tests/test-client.py:1095:test_004()/399 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3405 -location: clients/tests/test-client.py:1095:test_004()/399 -======= -size: 3400 +size: 3277 location: clients/tests/test-client.py:test_004()/399 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -23703,16 +22703,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 3345 -location: clients/tests/test-client.py:1095:test_004()/400 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3468 -location: clients/tests/test-client.py:1095:test_004()/400 -======= -size: 3463 +size: 3340 location: clients/tests/test-client.py:test_004()/400 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -23818,16 +22810,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 3420 -location: clients/tests/test-client.py:1099:test_004()/403 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3543 -location: clients/tests/test-client.py:1099:test_004()/403 -======= -size: 3538 +size: 3415 location: clients/tests/test-client.py:test_004()/403 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -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 @@ -23863,16 +22847,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 3483 -location: clients/tests/test-client.py:1099:test_004()/404 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3606 -location: clients/tests/test-client.py:1099:test_004()/404 -======= -size: 3601 +size: 3478 location: clients/tests/test-client.py:test_004()/404 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --color yes -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 @@ -24724,16 +23700,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = :: 2001:a::2934:bd66:550d:ec19 sear6.fo.x.y <<< -<<<<<<< HEAD -size: 22644 -location: clients/tests/test-client.py:1063:test_004()/423 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 22900 -location: clients/tests/test-client.py:1063:test_004()/423 -======= -size: 22895 +size: 22639 location: clients/tests/test-client.py:test_004()/423 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f all dev show lang: C returncode: 0 @@ -24928,16 +23896,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 23005 -location: clients/tests/test-client.py:1063:test_004()/424 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 23261 -location: clients/tests/test-client.py:1063:test_004()/424 -======= -size: 23256 +size: 23000 location: clients/tests/test-client.py:test_004()/424 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -25226,16 +24186,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 4474 -location: clients/tests/test-client.py:1069:test_004()/427 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4599 -location: clients/tests/test-client.py:1069:test_004()/427 -======= -size: 4594 +size: 4469 location: clients/tests/test-client.py:test_004()/427 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0 lang: C returncode: 0 @@ -25283,16 +24235,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4582 -location: clients/tests/test-client.py:1069:test_004()/428 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4707 -location: clients/tests/test-client.py:1069:test_004()/428 -======= -size: 4702 +size: 4577 location: clients/tests/test-client.py:test_004()/428 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25340,16 +24284,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1888 -location: clients/tests/test-client.py:1072:test_004()/429 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1918 -location: clients/tests/test-client.py:1072:test_004()/429 -======= -size: 1913 +size: 1883 location: clients/tests/test-client.py:test_004()/429 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -25371,16 +24307,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< -<<<<<<< HEAD -size: 1952 -location: clients/tests/test-client.py:1072:test_004()/430 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1982 -location: clients/tests/test-client.py:1072:test_004()/430 -======= -size: 1977 +size: 1947 location: clients/tests/test-client.py:test_004()/430 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25402,16 +24330,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MES WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< -<<<<<<< HEAD -size: 1888 -location: clients/tests/test-client.py:1075:test_004()/431 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1918 -location: clients/tests/test-client.py:1075:test_004()/431 -======= -size: 1913 +size: 1883 location: clients/tests/test-client.py:test_004()/431 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -25433,16 +24353,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< -<<<<<<< HEAD -size: 1952 -location: clients/tests/test-client.py:1075:test_004()/432 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1982 -location: clients/tests/test-client.py:1075:test_004()/432 -======= -size: 1977 +size: 1947 location: clients/tests/test-client.py:test_004()/432 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -25562,16 +24474,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ <<< -<<<<<<< HEAD -size: 1167 -location: clients/tests/test-client.py:1083:test_004()/437 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1334 -location: clients/tests/test-client.py:1083:test_004()/437 -======= -size: 1329 +size: 1162 location: clients/tests/test-client.py:test_004()/437 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list lang: C returncode: 0 @@ -25600,16 +24504,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ----------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 1398 -location: clients/tests/test-client.py:1083:test_004()/438 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1564 -location: clients/tests/test-client.py:1083:test_004()/438 -======= -size: 1559 +size: 1393 location: clients/tests/test-client.py:test_004()/438 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -25732,16 +24628,8 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -<<<<<<< HEAD -size: 514 -location: clients/tests/test-client.py:1090:test_004()/443 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 571 -location: clients/tests/test-client.py:1090:test_004()/443 -======= -size: 566 +size: 509 location: clients/tests/test-client.py:test_004()/443 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -25757,16 +24645,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 599 -location: clients/tests/test-client.py:1090:test_004()/444 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 656 -location: clients/tests/test-client.py:1090:test_004()/444 -======= -size: 651 +size: 594 location: clients/tests/test-client.py:test_004()/444 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -25816,16 +24696,8 @@ AP[1] wlan0-ap-2 776C616E302D61702D32 C0:E2:BE:E8:EF:B6 Infrastruktura 1 <<< -<<<<<<< HEAD -size: 4477 -location: clients/tests/test-client.py:1095:test_004()/447 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4602 -location: clients/tests/test-client.py:1095:test_004()/447 -======= -size: 4597 +size: 4472 location: clients/tests/test-client.py:test_004()/447 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: C returncode: 0 @@ -25873,16 +24745,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4585 -location: clients/tests/test-client.py:1095:test_004()/448 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4710 -location: clients/tests/test-client.py:1095:test_004()/448 -======= -size: 4705 +size: 4580 location: clients/tests/test-client.py:test_004()/448 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -26024,16 +24888,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 4615 -location: clients/tests/test-client.py:1099:test_004()/451 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4740 -location: clients/tests/test-client.py:1099:test_004()/451 -======= -size: 4735 +size: 4610 location: clients/tests/test-client.py:test_004()/451 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --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 @@ -26081,16 +24937,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4723 -location: clients/tests/test-client.py:1099:test_004()/452 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4848 -location: clients/tests/test-client.py:1099:test_004()/452 -======= -size: 4843 +size: 4718 location: clients/tests/test-client.py:test_004()/452 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --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 @@ -26962,16 +25810,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 2001:a::88ca:3654:96b:ab44/89 -- dst = 2001:a::cc8b:7c09:4673:bbb0/85, nh = ::, mt = 2821465568 | dst = 2001:a::a976:2488:f49f:b48/106, nh = 2001:a::62ae:c734:fc7b:e931, mt = 2248613879 | dst = 2001:a::afb7:4449:3787:8bb4/123, nh = :: 2001:a::2934:bd66:550d:ec19 sear6.fo.x.y <<< -<<<<<<< HEAD -size: 22980 -location: clients/tests/test-client.py:1063:test_004()/471 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 23272 -location: clients/tests/test-client.py:1063:test_004()/471 -======= -size: 23267 +size: 22975 location: clients/tests/test-client.py:test_004()/471 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show lang: C returncode: 0 @@ -27166,16 +26006,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 23341 -location: clients/tests/test-client.py:1063:test_004()/472 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 23633 -location: clients/tests/test-client.py:1063:test_004()/472 -======= -size: 23628 +size: 23336 location: clients/tests/test-client.py:test_004()/472 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -27464,16 +26296,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 4729 -location: clients/tests/test-client.py:1069:test_004()/475 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4881 -location: clients/tests/test-client.py:1069:test_004()/475 -======= -size: 4876 +size: 4724 location: clients/tests/test-client.py:test_004()/475 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -27521,16 +26345,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4837 -location: clients/tests/test-client.py:1069:test_004()/476 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4989 -location: clients/tests/test-client.py:1069:test_004()/476 -======= -size: 4984 +size: 4832 location: clients/tests/test-client.py:test_004()/476 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27578,16 +26394,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1900 -location: clients/tests/test-client.py:1072:test_004()/477 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1930 -location: clients/tests/test-client.py:1072:test_004()/477 -======= -size: 1925 +size: 1895 location: clients/tests/test-client.py:test_004()/477 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -27609,16 +26417,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< -<<<<<<< HEAD -size: 1964 -location: clients/tests/test-client.py:1072:test_004()/478 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1994 -location: clients/tests/test-client.py:1072:test_004()/478 -======= -size: 1989 +size: 1959 location: clients/tests/test-client.py:test_004()/478 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27640,16 +26440,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MES WIFI-PROPERTIES tak tak tak tak tak tak tak nieznane nieznane nie <<< -<<<<<<< HEAD -size: 1900 -location: clients/tests/test-client.py:1075:test_004()/479 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1930 -location: clients/tests/test-client.py:1075:test_004()/479 -======= -size: 1925 +size: 1895 location: clients/tests/test-client.py:test_004()/479 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -27671,16 +26463,8 @@ NAME WEP WPA WPA2 TKIP CCMP AP ADHOC 2GHZ 5GHZ MESH WIFI-PROPERTIES yes yes yes yes yes yes yes unknown unknown no <<< -<<<<<<< HEAD -size: 1964 -location: clients/tests/test-client.py:1075:test_004()/480 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1994 -location: clients/tests/test-client.py:1075:test_004()/480 -======= -size: 1989 +size: 1959 location: clients/tests/test-client.py:test_004()/480 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -27800,16 +26584,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ <<< -<<<<<<< HEAD -size: 1468 -location: clients/tests/test-client.py:1083:test_004()/485 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1670 -location: clients/tests/test-client.py:1083:test_004()/485 -======= -size: 1665 +size: 1463 location: clients/tests/test-client.py:test_004()/485 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -27838,16 +26614,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ----------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 1698 -location: clients/tests/test-client.py:1083:test_004()/486 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1900 -location: clients/tests/test-client.py:1083:test_004()/486 -======= -size: 1895 +size: 1693 location: clients/tests/test-client.py:test_004()/486 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -27970,16 +26738,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -<<<<<<< HEAD -size: 598 -location: clients/tests/test-client.py:1090:test_004()/491 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 664 -location: clients/tests/test-client.py:1090:test_004()/491 -======= -size: 659 +size: 593 location: clients/tests/test-client.py:test_004()/491 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -27995,16 +26755,8 @@ IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY <<< -<<<<<<< HEAD -size: 683 -location: clients/tests/test-client.py:1090:test_004()/492 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 749 -location: clients/tests/test-client.py:1090:test_004()/492 -======= -size: 744 +size: 678 location: clients/tests/test-client.py:test_004()/492 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -28054,16 +26806,8 @@ NAME SSID SSID-HEX BSSID MODE CHAN <<< -<<<<<<< HEAD -size: 4732 -location: clients/tests/test-client.py:1095:test_004()/495 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4884 -location: clients/tests/test-client.py:1095:test_004()/495 -======= -size: 4879 +size: 4727 location: clients/tests/test-client.py:test_004()/495 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -28111,16 +26855,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4840 -location: clients/tests/test-client.py:1095:test_004()/496 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 4992 -location: clients/tests/test-client.py:1095:test_004()/496 -======= -size: 4987 +size: 4835 location: clients/tests/test-client.py:test_004()/496 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28262,16 +26998,8 @@ GROUP ADDRESS GATEWAY ROUTE IP6 -- -- dst = 2001:a::dd5b:aa7b:b4a2:e42/102, nh = ::, mt = 2504159086 -- sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 4870 -location: clients/tests/test-client.py:1099:test_004()/499 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5022 -location: clients/tests/test-client.py:1099:test_004()/499 -======= -size: 5017 +size: 4865 location: clients/tests/test-client.py:test_004()/499 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -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 @@ -28319,16 +27047,8 @@ NAME AVAILABLE-CONNECTION-PATHS AVAILABLE- CONNECTIONS /org/freedesktop/NetworkManager/Settings/Connection/{2} UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4978 -location: clients/tests/test-client.py:1099:test_004()/500 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5130 -location: clients/tests/test-client.py:1099:test_004()/500 -======= -size: 5125 +size: 4973 location: clients/tests/test-client.py:test_004()/500 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --pretty --color yes -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 @@ -28718,16 +27438,8 @@ IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y <<< -<<<<<<< HEAD -size: 6324 -location: clients/tests/test-client.py:1063:test_004()/519 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6425 -location: clients/tests/test-client.py:1063:test_004()/519 -======= -size: 6420 +size: 6319 location: clients/tests/test-client.py:test_004()/519 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f all dev show lang: C returncode: 0 @@ -28783,16 +27495,8 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 6370 -location: clients/tests/test-client.py:1063:test_004()/520 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6471 -location: clients/tests/test-client.py:1063:test_004()/520 -======= -size: 6466 +size: 6365 location: clients/tests/test-client.py:test_004()/520 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -28884,16 +27588,8 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 1358 -location: clients/tests/test-client.py:1069:test_004()/523 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1430 -location: clients/tests/test-client.py:1069:test_004()/523 -======= -size: 1425 +size: 1353 location: clients/tests/test-client.py:test_004()/523 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f all dev show wlan0 lang: C returncode: 0 @@ -28912,16 +27608,8 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1395 -location: clients/tests/test-client.py:1069:test_004()/524 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1467 -location: clients/tests/test-client.py:1069:test_004()/524 -======= -size: 1462 +size: 1390 location: clients/tests/test-client.py:test_004()/524 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28940,16 +27628,8 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 568 -location: clients/tests/test-client.py:1072:test_004()/525 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 571 -location: clients/tests/test-client.py:1072:test_004()/525 -======= -size: 566 +size: 563 location: clients/tests/test-client.py:test_004()/525 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -28960,16 +27640,8 @@ GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavail WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no <<< -<<<<<<< HEAD -size: 578 -location: clients/tests/test-client.py:1072:test_004()/526 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 581 -location: clients/tests/test-client.py:1072:test_004()/526 -======= -size: 576 +size: 573 location: clients/tests/test-client.py:test_004()/526 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -28980,16 +27652,8 @@ GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavail WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no <<< -<<<<<<< HEAD -size: 568 -location: clients/tests/test-client.py:1075:test_004()/527 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 571 -location: clients/tests/test-client.py:1075:test_004()/527 -======= -size: 566 +size: 563 location: clients/tests/test-client.py:test_004()/527 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -29000,16 +27664,8 @@ GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavail WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no <<< -<<<<<<< HEAD -size: 578 -location: clients/tests/test-client.py:1075:test_004()/528 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 581 -location: clients/tests/test-client.py:1075:test_004()/528 -======= -size: 576 +size: 573 location: clients/tests/test-client.py:test_004()/528 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29078,16 +27734,8 @@ AP[1]:wlan1-ap-4:776C616E312D61702D34:94\:2B\:E8\:F6\:D2\:86:Infrastruktura:1:24 <<< -<<<<<<< HEAD -size: 358 -location: clients/tests/test-client.py:1083:test_004()/533 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 450 -location: clients/tests/test-client.py:1083:test_004()/533 -======= -size: 445 +size: 353 location: clients/tests/test-client.py:test_004()/533 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list lang: C returncode: 0 @@ -29101,16 +27749,8 @@ stdout: 188 bytes <<< -<<<<<<< HEAD -size: 404 -location: clients/tests/test-client.py:1083:test_004()/534 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 496 -location: clients/tests/test-client.py:1083:test_004()/534 -======= -size: 491 +size: 399 location: clients/tests/test-client.py:test_004()/534 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -29178,16 +27818,8 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< -<<<<<<< HEAD -size: 244 -location: clients/tests/test-client.py:1090:test_004()/539 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 267 -location: clients/tests/test-client.py:1090:test_004()/539 -======= -size: 262 +size: 239 location: clients/tests/test-client.py:test_004()/539 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -29198,16 +27830,8 @@ stdout: 51 bytes <<< -<<<<<<< HEAD -size: 263 -location: clients/tests/test-client.py:1090:test_004()/540 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 286 -location: clients/tests/test-client.py:1090:test_004()/540 -======= -size: 281 +size: 258 location: clients/tests/test-client.py:test_004()/540 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -29242,16 +27866,8 @@ AP[1]:wlan0-ap-2:776C616E302D61702D32:C0\:E2\:BE\:E8\:EF\:B6:Infrastruktura:1:24 <<< -<<<<<<< HEAD -size: 1361 -location: clients/tests/test-client.py:1095:test_004()/543 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1433 -location: clients/tests/test-client.py:1095:test_004()/543 -======= -size: 1428 +size: 1356 location: clients/tests/test-client.py:test_004()/543 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: C returncode: 0 @@ -29270,16 +27886,8 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1398 -location: clients/tests/test-client.py:1095:test_004()/544 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1470 -location: clients/tests/test-client.py:1095:test_004()/544 -======= -size: 1465 +size: 1393 location: clients/tests/test-client.py:test_004()/544 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29334,16 +27942,8 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 1499 -location: clients/tests/test-client.py:1099:test_004()/547 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1571 -location: clients/tests/test-client.py:1099:test_004()/547 -======= -size: 1566 +size: 1494 location: clients/tests/test-client.py:test_004()/547 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --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 @@ -29362,16 +27962,8 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1536 -location: clients/tests/test-client.py:1099:test_004()/548 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1608 -location: clients/tests/test-client.py:1099:test_004()/548 -======= -size: 1603 +size: 1531 location: clients/tests/test-client.py:test_004()/548 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --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 @@ -29722,16 +28314,8 @@ IP4:192.168.97.124/29 | 192.168.76.154/18::dst = 192.168.33.233/22, nh = 192.168 IP6:2001\:a\:\:88ca\:3654\:96b\:ab44/89::dst = 2001\:a\:\:cc8b\:7c09\:4673\:bbb0/85, nh = \:\:, mt = 2821465568 | dst = 2001\:a\:\:a976\:2488\:f49f\:b48/106, nh = 2001\:a\:\:62ae\:c734\:fc7b\:e931, mt = 2248613879 | dst = 2001\:a\:\:afb7\:4449\:3787\:8bb4/123, nh = \:\::2001\:a\:\:2934\:bd66\:550d\:ec19:sear6.fo.x.y <<< -<<<<<<< HEAD -size: 6660 -location: clients/tests/test-client.py:1063:test_004()/567 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6797 -location: clients/tests/test-client.py:1063:test_004()/567 -======= -size: 6792 +size: 6655 location: clients/tests/test-client.py:test_004()/567 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f all dev show lang: C returncode: 0 @@ -29787,16 +28371,8 @@ DHCP6:dhcp-6-opt-2 = val-2 | dhcp-6-opt-6 = val-6 | dhcp-6-opt-7 = val-7 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 6706 -location: clients/tests/test-client.py:1063:test_004()/568 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6843 -location: clients/tests/test-client.py:1063:test_004()/568 -======= -size: 6838 +size: 6701 location: clients/tests/test-client.py:test_004()/568 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -29888,16 +28464,8 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 1613 -location: clients/tests/test-client.py:1069:test_004()/571 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1712 -location: clients/tests/test-client.py:1069:test_004()/571 -======= -size: 1707 +size: 1608 location: clients/tests/test-client.py:test_004()/571 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -29916,16 +28484,8 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1650 -location: clients/tests/test-client.py:1069:test_004()/572 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1749 -location: clients/tests/test-client.py:1069:test_004()/572 -======= -size: 1744 +size: 1645 location: clients/tests/test-client.py:test_004()/572 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29944,16 +28504,8 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 580 -location: clients/tests/test-client.py:1072:test_004()/573 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 583 -location: clients/tests/test-client.py:1072:test_004()/573 -======= -size: 578 +size: 575 location: clients/tests/test-client.py:test_004()/573 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -29964,16 +28516,8 @@ GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavail WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no <<< -<<<<<<< HEAD -size: 590 -location: clients/tests/test-client.py:1072:test_004()/574 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 593 -location: clients/tests/test-client.py:1072:test_004()/574 -======= -size: 588 +size: 585 location: clients/tests/test-client.py:test_004()/574 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -29984,16 +28528,8 @@ GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavail WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no <<< -<<<<<<< HEAD -size: 580 -location: clients/tests/test-client.py:1075:test_004()/575 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 583 -location: clients/tests/test-client.py:1075:test_004()/575 -======= -size: 578 +size: 575 location: clients/tests/test-client.py:test_004()/575 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -30004,16 +28540,8 @@ GENERAL:wlan0:wifi:NMDeviceWifi:::virtual:::13\:E0\:74\:85\:7C\:D9:0:20 (unavail WIFI-PROPERTIES:yes:yes:yes:yes:yes:yes:yes:unknown:unknown:no <<< -<<<<<<< HEAD -size: 590 -location: clients/tests/test-client.py:1075:test_004()/576 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 593 -location: clients/tests/test-client.py:1075:test_004()/576 -======= -size: 588 +size: 585 location: clients/tests/test-client.py:test_004()/576 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -30082,16 +28610,8 @@ stdout: 1594 bytes <<< -<<<<<<< HEAD -size: 658 -location: clients/tests/test-client.py:1083:test_004()/581 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 786 -location: clients/tests/test-client.py:1083:test_004()/581 -======= -size: 781 +size: 653 location: clients/tests/test-client.py:test_004()/581 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -30105,16 +28625,8 @@ stdout: 476 bytes <<< -<<<<<<< HEAD -size: 704 -location: clients/tests/test-client.py:1083:test_004()/582 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 832 -location: clients/tests/test-client.py:1083:test_004()/582 -======= -size: 827 +size: 699 location: clients/tests/test-client.py:test_004()/582 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -30182,16 +28694,8 @@ stdout: 422 bytes <<< -<<<<<<< HEAD -size: 329 -location: clients/tests/test-client.py:1090:test_004()/587 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 361 -location: clients/tests/test-client.py:1090:test_004()/587 -======= -size: 356 +size: 324 location: clients/tests/test-client.py:test_004()/587 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -30202,16 +28706,8 @@ stdout: 123 bytes <<< -<<<<<<< HEAD -size: 348 -location: clients/tests/test-client.py:1090:test_004()/588 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 380 -location: clients/tests/test-client.py:1090:test_004()/588 -======= -size: 375 +size: 343 location: clients/tests/test-client.py:test_004()/588 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -30246,16 +28742,8 @@ stdout: 422 bytes <<< -<<<<<<< HEAD -size: 1616 -location: clients/tests/test-client.py:1095:test_004()/591 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1715 -location: clients/tests/test-client.py:1095:test_004()/591 -======= -size: 1710 +size: 1611 location: clients/tests/test-client.py:test_004()/591 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -30274,16 +28762,8 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1653 -location: clients/tests/test-client.py:1095:test_004()/592 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1752 -location: clients/tests/test-client.py:1095:test_004()/592 -======= -size: 1747 +size: 1648 location: clients/tests/test-client.py:test_004()/592 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -30338,16 +28818,8 @@ IP4:192.168.228.18/32 | 192.168.209.179/25:192.168.41.120:::sear4.foo2.bar | sea IP6:::dst = 2001\:a\:\:dd5b\:aa7b\:b4a2\:e42/102, nh = \:\:, mt = 2504159086::sear6.foo2.bar | sear6.foo1.bar | sear6.fo.x.y | sear6.fo.o.bar | sear6.foo3.bar | sear6.foo4.bar <<< -<<<<<<< HEAD -size: 1754 -location: clients/tests/test-client.py:1099:test_004()/595 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1853 -location: clients/tests/test-client.py:1099:test_004()/595 -======= -size: 1848 +size: 1749 location: clients/tests/test-client.py:test_004()/595 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -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 @@ -30366,16 +28838,8 @@ DHCP6:dhcp-6-opt-1 = val-1 | dhcp-6-opt-2 = val-2 | dhcp-6-opt-3 = val-3 | dhcp- CONNECTIONS:/org/freedesktop/NetworkManager/Settings/Connection/{2}:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1791 -location: clients/tests/test-client.py:1099:test_004()/596 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1890 -location: clients/tests/test-client.py:1099:test_004()/596 -======= -size: 1885 +size: 1786 location: clients/tests/test-client.py:test_004()/596 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode tabular --terse --color yes -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 @@ -31538,16 +30002,8 @@ IP6.DNS[1]: 2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]: sear6.fo.x.y <<< -<<<<<<< HEAD -size: 20807 -location: clients/tests/test-client.py:1063:test_004()/615 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 21168 -location: clients/tests/test-client.py:1063:test_004()/615 -======= -size: 21163 +size: 20802 location: clients/tests/test-client.py:test_004()/615 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f all dev show lang: C returncode: 0 @@ -31938,16 +30394,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 20960 -location: clients/tests/test-client.py:1063:test_004()/616 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 21324 -location: clients/tests/test-client.py:1063:test_004()/616 -======= -size: 21319 +size: 20955 location: clients/tests/test-client.py:test_004()/616 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -32404,16 +30852,8 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -<<<<<<< HEAD -size: 4908 -location: clients/tests/test-client.py:1069:test_004()/619 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5125 -location: clients/tests/test-client.py:1069:test_004()/619 -======= -size: 5120 +size: 4903 location: clients/tests/test-client.py:test_004()/619 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f all dev show wlan0 lang: C returncode: 0 @@ -32513,16 +30953,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4964 -location: clients/tests/test-client.py:1069:test_004()/620 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5182 -location: clients/tests/test-client.py:1069:test_004()/620 -======= -size: 5177 +size: 4959 location: clients/tests/test-client.py:test_004()/620 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -32622,16 +31054,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2021 -location: clients/tests/test-client.py:1072:test_004()/621 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2064 -location: clients/tests/test-client.py:1072:test_004()/621 -======= -size: 2059 +size: 2016 location: clients/tests/test-client.py:test_004()/621 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -32676,16 +31100,8 @@ WIFI-PROPERTIES.5GHZ: unknown WIFI-PROPERTIES.MESH: no <<< -<<<<<<< HEAD -size: 2046 -location: clients/tests/test-client.py:1072:test_004()/622 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2090 -location: clients/tests/test-client.py:1072:test_004()/622 -======= -size: 2085 +size: 2041 location: clients/tests/test-client.py:test_004()/622 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -32730,16 +31146,8 @@ WIFI-PROPERTIES.5GHZ: nieznane WIFI-PROPERTIES.MESH: nie <<< -<<<<<<< HEAD -size: 2021 -location: clients/tests/test-client.py:1075:test_004()/623 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2064 -location: clients/tests/test-client.py:1075:test_004()/623 -======= -size: 2059 +size: 2016 location: clients/tests/test-client.py:test_004()/623 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -32784,16 +31192,8 @@ WIFI-PROPERTIES.5GHZ: unknown WIFI-PROPERTIES.MESH: no <<< -<<<<<<< HEAD -size: 2046 -location: clients/tests/test-client.py:1075:test_004()/624 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2090 -location: clients/tests/test-client.py:1075:test_004()/624 -======= -size: 2085 +size: 2041 location: clients/tests/test-client.py:test_004()/624 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -33044,16 +31444,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< -<<<<<<< HEAD -size: 1633 -location: clients/tests/test-client.py:1083:test_004()/629 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1865 -location: clients/tests/test-client.py:1083:test_004()/629 -======= -size: 1860 +size: 1628 location: clients/tests/test-client.py:test_004()/629 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f COMMON device wifi list lang: C returncode: 0 @@ -33095,16 +31487,8 @@ SECURITY: WPA1 WPA2 <<< -<<<<<<< HEAD -size: 1679 -location: clients/tests/test-client.py:1083:test_004()/630 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1911 -location: clients/tests/test-client.py:1083:test_004()/630 -======= -size: 1906 +size: 1674 location: clients/tests/test-client.py:test_004()/630 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -33360,16 +31744,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< -<<<<<<< HEAD -size: 559 -location: clients/tests/test-client.py:1090:test_004()/635 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 617 -location: clients/tests/test-client.py:1090:test_004()/635 -======= -size: 612 +size: 554 location: clients/tests/test-client.py:test_004()/635 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -33387,16 +31763,8 @@ SECURITY: WPA1 WPA2 <<< -<<<<<<< HEAD -size: 578 -location: clients/tests/test-client.py:1090:test_004()/636 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 636 -location: clients/tests/test-client.py:1090:test_004()/636 -======= -size: 631 +size: 573 location: clients/tests/test-client.py:test_004()/636 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -33470,16 +31838,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< -<<<<<<< HEAD -size: 4911 -location: clients/tests/test-client.py:1095:test_004()/639 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5128 -location: clients/tests/test-client.py:1095:test_004()/639 -======= -size: 5123 +size: 4906 location: clients/tests/test-client.py:test_004()/639 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: C returncode: 0 @@ -33579,16 +31939,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 4967 -location: clients/tests/test-client.py:1095:test_004()/640 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5185 -location: clients/tests/test-client.py:1095:test_004()/640 -======= -size: 5180 +size: 4962 location: clients/tests/test-client.py:test_004()/640 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -33754,16 +32106,8 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -<<<<<<< HEAD -size: 5049 -location: clients/tests/test-client.py:1099:test_004()/643 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5266 -location: clients/tests/test-client.py:1099:test_004()/643 -======= -size: 5261 +size: 5044 location: clients/tests/test-client.py:test_004()/643 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -33863,16 +32207,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 5105 -location: clients/tests/test-client.py:1099:test_004()/644 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5323 -location: clients/tests/test-client.py:1099:test_004()/644 -======= -size: 5318 +size: 5100 location: clients/tests/test-client.py:test_004()/644 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -35152,16 +33488,8 @@ IP6.DNS[1]: 2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]: sear6.fo.x.y <<< -<<<<<<< HEAD -size: 21107 -location: clients/tests/test-client.py:1063:test_004()/663 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 21504 -location: clients/tests/test-client.py:1063:test_004()/663 -======= -size: 21499 +size: 21102 location: clients/tests/test-client.py:test_004()/663 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f all dev show lang: C returncode: 0 @@ -35552,16 +33880,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 21260 -location: clients/tests/test-client.py:1063:test_004()/664 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 21660 -location: clients/tests/test-client.py:1063:test_004()/664 -======= -size: 21655 +size: 21255 location: clients/tests/test-client.py:test_004()/664 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -36018,16 +34338,8 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -<<<<<<< HEAD -size: 5136 -location: clients/tests/test-client.py:1069:test_004()/667 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5380 -location: clients/tests/test-client.py:1069:test_004()/667 -======= -size: 5375 +size: 5131 location: clients/tests/test-client.py:test_004()/667 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -36127,16 +34439,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 5192 -location: clients/tests/test-client.py:1069:test_004()/668 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5437 -location: clients/tests/test-client.py:1069:test_004()/668 -======= -size: 5432 +size: 5187 location: clients/tests/test-client.py:test_004()/668 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -36236,16 +34540,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2033 -location: clients/tests/test-client.py:1072:test_004()/669 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2076 -location: clients/tests/test-client.py:1072:test_004()/669 -======= -size: 2071 +size: 2028 location: clients/tests/test-client.py:test_004()/669 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -36290,16 +34586,8 @@ WIFI-PROPERTIES.5GHZ: unknown WIFI-PROPERTIES.MESH: no <<< -<<<<<<< HEAD -size: 2058 -location: clients/tests/test-client.py:1072:test_004()/670 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2102 -location: clients/tests/test-client.py:1072:test_004()/670 -======= -size: 2097 +size: 2053 location: clients/tests/test-client.py:test_004()/670 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -36344,16 +34632,8 @@ WIFI-PROPERTIES.5GHZ: nieznane WIFI-PROPERTIES.MESH: nie <<< -<<<<<<< HEAD -size: 2033 -location: clients/tests/test-client.py:1075:test_004()/671 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2076 -location: clients/tests/test-client.py:1075:test_004()/671 -======= -size: 2071 +size: 2028 location: clients/tests/test-client.py:test_004()/671 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -36398,16 +34678,8 @@ WIFI-PROPERTIES.5GHZ: unknown WIFI-PROPERTIES.MESH: no <<< -<<<<<<< HEAD -size: 2058 -location: clients/tests/test-client.py:1075:test_004()/672 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2102 -location: clients/tests/test-client.py:1075:test_004()/672 -======= -size: 2097 +size: 2053 location: clients/tests/test-client.py:test_004()/672 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -36658,16 +34930,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< -<<<<<<< HEAD -size: 1933 -location: clients/tests/test-client.py:1083:test_004()/677 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2201 -location: clients/tests/test-client.py:1083:test_004()/677 -======= -size: 2196 +size: 1928 location: clients/tests/test-client.py:test_004()/677 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -36709,16 +34973,8 @@ SECURITY: WPA1 WPA2 <<< -<<<<<<< HEAD -size: 1979 -location: clients/tests/test-client.py:1083:test_004()/678 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2247 -location: clients/tests/test-client.py:1083:test_004()/678 -======= -size: 2242 +size: 1974 location: clients/tests/test-client.py:test_004()/678 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -36974,16 +35230,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< -<<<<<<< HEAD -size: 643 -location: clients/tests/test-client.py:1090:test_004()/683 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 710 -location: clients/tests/test-client.py:1090:test_004()/683 -======= -size: 705 +size: 638 location: clients/tests/test-client.py:test_004()/683 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -37001,16 +35249,8 @@ SECURITY: WPA1 WPA2 <<< -<<<<<<< HEAD -size: 662 -location: clients/tests/test-client.py:1090:test_004()/684 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 729 -location: clients/tests/test-client.py:1090:test_004()/684 -======= -size: 724 +size: 657 location: clients/tests/test-client.py:test_004()/684 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -37084,16 +35324,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< -<<<<<<< HEAD -size: 5139 -location: clients/tests/test-client.py:1095:test_004()/687 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5383 -location: clients/tests/test-client.py:1095:test_004()/687 -======= -size: 5378 +size: 5134 location: clients/tests/test-client.py:test_004()/687 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -37193,16 +35425,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 5195 -location: clients/tests/test-client.py:1095:test_004()/688 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5440 -location: clients/tests/test-client.py:1095:test_004()/688 -======= -size: 5435 +size: 5190 location: clients/tests/test-client.py:test_004()/688 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -37368,16 +35592,8 @@ IP6.DOMAIN[5]: sear6.foo3.bar IP6.DOMAIN[6]: sear6.foo4.bar <<< -<<<<<<< HEAD -size: 5277 -location: clients/tests/test-client.py:1099:test_004()/691 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5521 -location: clients/tests/test-client.py:1099:test_004()/691 -======= -size: 5516 +size: 5272 location: clients/tests/test-client.py:test_004()/691 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -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 @@ -37477,16 +35693,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 5333 -location: clients/tests/test-client.py:1099:test_004()/692 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 5578 -location: clients/tests/test-client.py:1099:test_004()/692 -======= -size: 5573 +size: 5328 location: clients/tests/test-client.py:test_004()/692 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --color yes -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 @@ -39006,16 +37214,8 @@ IP6.DOMAIN[1]: sear6.fo.x.y ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 25391 -location: clients/tests/test-client.py:1063:test_004()/711 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 25752 -location: clients/tests/test-client.py:1063:test_004()/711 -======= -size: 25747 +size: 25386 location: clients/tests/test-client.py:test_004()/711 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f all dev show lang: C returncode: 0 @@ -39465,16 +37665,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 25577 -location: clients/tests/test-client.py:1063:test_004()/712 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 25941 -location: clients/tests/test-client.py:1063:test_004()/712 -======= -size: 25936 +size: 25572 location: clients/tests/test-client.py:test_004()/712 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -40014,16 +38206,8 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6008 -location: clients/tests/test-client.py:1069:test_004()/715 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6225 -location: clients/tests/test-client.py:1069:test_004()/715 -======= -size: 6220 +size: 6003 location: clients/tests/test-client.py:test_004()/715 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0 lang: C returncode: 0 @@ -40137,16 +38321,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6071 -location: clients/tests/test-client.py:1069:test_004()/716 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6289 -location: clients/tests/test-client.py:1069:test_004()/716 -======= -size: 6284 +size: 6066 location: clients/tests/test-client.py:test_004()/716 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -40260,16 +38436,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2481 -location: clients/tests/test-client.py:1072:test_004()/717 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2524 -location: clients/tests/test-client.py:1072:test_004()/717 -======= -size: 2519 +size: 2476 location: clients/tests/test-client.py:test_004()/717 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -40320,16 +38488,8 @@ WIFI-PROPERTIES.MESH: no ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2513 -location: clients/tests/test-client.py:1072:test_004()/718 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2557 -location: clients/tests/test-client.py:1072:test_004()/718 -======= -size: 2552 +size: 2508 location: clients/tests/test-client.py:test_004()/718 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -40380,16 +38540,8 @@ WIFI-PROPERTIES.MESH: nie ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2481 -location: clients/tests/test-client.py:1075:test_004()/719 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2524 -location: clients/tests/test-client.py:1075:test_004()/719 -======= -size: 2519 +size: 2476 location: clients/tests/test-client.py:test_004()/719 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -40440,16 +38592,8 @@ WIFI-PROPERTIES.MESH: no ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2513 -location: clients/tests/test-client.py:1075:test_004()/720 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2557 -location: clients/tests/test-client.py:1075:test_004()/720 -======= -size: 2552 +size: 2508 location: clients/tests/test-client.py:test_004()/720 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -40748,16 +38892,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo =============================================================================== <<< -<<<<<<< HEAD -size: 2598 -location: clients/tests/test-client.py:1083:test_004()/725 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2830 -location: clients/tests/test-client.py:1083:test_004()/725 -======= -size: 2825 +size: 2593 location: clients/tests/test-client.py:test_004()/725 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list lang: C returncode: 0 @@ -40812,16 +38948,8 @@ SECURITY: WPA1 WPA2 =============================================================================== <<< -<<<<<<< HEAD -size: 2662 -location: clients/tests/test-client.py:1083:test_004()/726 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2894 -location: clients/tests/test-client.py:1083:test_004()/726 -======= -size: 2889 +size: 2657 location: clients/tests/test-client.py:test_004()/726 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -41124,16 +39252,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< -<<<<<<< HEAD -size: 860 -location: clients/tests/test-client.py:1090:test_004()/731 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 918 -location: clients/tests/test-client.py:1090:test_004()/731 -======= -size: 913 +size: 855 location: clients/tests/test-client.py:test_004()/731 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -41155,16 +39275,8 @@ SECURITY: WPA1 WPA2 <<< -<<<<<<< HEAD -size: 885 -location: clients/tests/test-client.py:1090:test_004()/732 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 943 -location: clients/tests/test-client.py:1090:test_004()/732 -======= -size: 938 +size: 880 location: clients/tests/test-client.py:test_004()/732 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -41250,16 +39362,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/AccessPo <<< -<<<<<<< HEAD -size: 6011 -location: clients/tests/test-client.py:1095:test_004()/735 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6228 -location: clients/tests/test-client.py:1095:test_004()/735 -======= -size: 6223 +size: 6006 location: clients/tests/test-client.py:test_004()/735 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: C returncode: 0 @@ -41373,16 +39477,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6074 -location: clients/tests/test-client.py:1095:test_004()/736 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6292 -location: clients/tests/test-client.py:1095:test_004()/736 -======= -size: 6287 +size: 6069 location: clients/tests/test-client.py:test_004()/736 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -41586,16 +39682,8 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6149 -location: clients/tests/test-client.py:1099:test_004()/739 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6366 -location: clients/tests/test-client.py:1099:test_004()/739 -======= -size: 6361 +size: 6144 location: clients/tests/test-client.py:test_004()/739 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -41709,16 +39797,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6212 -location: clients/tests/test-client.py:1099:test_004()/740 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6430 -location: clients/tests/test-client.py:1099:test_004()/740 -======= -size: 6425 +size: 6207 location: clients/tests/test-client.py:test_004()/740 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -43264,16 +41344,8 @@ IP6.DOMAIN[1]: sear6.fo.x.y ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 25691 -location: clients/tests/test-client.py:1063:test_004()/759 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 26088 -location: clients/tests/test-client.py:1063:test_004()/759 -======= -size: 26083 +size: 25686 location: clients/tests/test-client.py:test_004()/759 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show lang: C returncode: 0 @@ -43723,16 +41795,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 25877 -location: clients/tests/test-client.py:1063:test_004()/760 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 26277 -location: clients/tests/test-client.py:1063:test_004()/760 -======= -size: 26272 +size: 25872 location: clients/tests/test-client.py:test_004()/760 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -44272,16 +42336,8 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6236 -location: clients/tests/test-client.py:1069:test_004()/763 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6480 -location: clients/tests/test-client.py:1069:test_004()/763 -======= -size: 6475 +size: 6231 location: clients/tests/test-client.py:test_004()/763 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -44395,16 +42451,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6299 -location: clients/tests/test-client.py:1069:test_004()/764 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6544 -location: clients/tests/test-client.py:1069:test_004()/764 -======= -size: 6539 +size: 6294 location: clients/tests/test-client.py:test_004()/764 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -44518,16 +42566,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2493 -location: clients/tests/test-client.py:1072:test_004()/765 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2536 -location: clients/tests/test-client.py:1072:test_004()/765 -======= -size: 2531 +size: 2488 location: clients/tests/test-client.py:test_004()/765 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -44578,16 +42618,8 @@ WIFI-PROPERTIES.MESH: no ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2525 -location: clients/tests/test-client.py:1072:test_004()/766 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2569 -location: clients/tests/test-client.py:1072:test_004()/766 -======= -size: 2564 +size: 2520 location: clients/tests/test-client.py:test_004()/766 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -44638,16 +42670,8 @@ WIFI-PROPERTIES.MESH: nie ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2493 -location: clients/tests/test-client.py:1075:test_004()/767 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2536 -location: clients/tests/test-client.py:1075:test_004()/767 -======= -size: 2531 +size: 2488 location: clients/tests/test-client.py:test_004()/767 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -44698,16 +42722,8 @@ WIFI-PROPERTIES.MESH: no ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 2525 -location: clients/tests/test-client.py:1075:test_004()/768 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2569 -location: clients/tests/test-client.py:1075:test_004()/768 -======= -size: 2564 +size: 2520 location: clients/tests/test-client.py:test_004()/768 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -45006,16 +43022,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc =============================================================================== <<< -<<<<<<< HEAD -size: 2898 -location: clients/tests/test-client.py:1083:test_004()/773 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3166 -location: clients/tests/test-client.py:1083:test_004()/773 -======= -size: 3161 +size: 2893 location: clients/tests/test-client.py:test_004()/773 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -45070,16 +43078,8 @@ SECURITY: WPA1 WPA2 =============================================================================== <<< -<<<<<<< HEAD -size: 2962 -location: clients/tests/test-client.py:1083:test_004()/774 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3230 -location: clients/tests/test-client.py:1083:test_004()/774 -======= -size: 3225 +size: 2957 location: clients/tests/test-client.py:test_004()/774 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -45382,16 +43382,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< -<<<<<<< HEAD -size: 944 -location: clients/tests/test-client.py:1090:test_004()/779 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1011 -location: clients/tests/test-client.py:1090:test_004()/779 -======= -size: 1006 +size: 939 location: clients/tests/test-client.py:test_004()/779 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -45413,16 +43405,8 @@ SECURITY: WPA1 WPA2 <<< -<<<<<<< HEAD -size: 969 -location: clients/tests/test-client.py:1090:test_004()/780 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1036 -location: clients/tests/test-client.py:1090:test_004()/780 -======= -size: 1031 +size: 964 location: clients/tests/test-client.py:test_004()/780 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -45508,16 +43492,8 @@ DBUS-PATH: /org/freedesktop/NetworkManager/Acc <<< -<<<<<<< HEAD -size: 6239 -location: clients/tests/test-client.py:1095:test_004()/783 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6483 -location: clients/tests/test-client.py:1095:test_004()/783 -======= -size: 6478 +size: 6234 location: clients/tests/test-client.py:test_004()/783 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -45631,16 +43607,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6302 -location: clients/tests/test-client.py:1095:test_004()/784 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6547 -location: clients/tests/test-client.py:1095:test_004()/784 -======= -size: 6542 +size: 6297 location: clients/tests/test-client.py:test_004()/784 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -45844,16 +43812,8 @@ IP6.DOMAIN[6]: sear6.foo4.bar ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6377 -location: clients/tests/test-client.py:1099:test_004()/787 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6621 -location: clients/tests/test-client.py:1099:test_004()/787 -======= -size: 6616 +size: 6372 location: clients/tests/test-client.py:test_004()/787 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -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 @@ -45967,16 +43927,8 @@ CONNECTIONS.AVAILABLE-CONNECTIONS[1]: UUID-con-xx1-REPLACED-REPLACED-REPLA | c ------------------------------------------------------------------------------- <<< -<<<<<<< HEAD -size: 6440 -location: clients/tests/test-client.py:1099:test_004()/788 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 6685 -location: clients/tests/test-client.py:1099:test_004()/788 -======= -size: 6680 +size: 6435 location: clients/tests/test-client.py:test_004()/788 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --pretty --color yes -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 @@ -47282,16 +45234,8 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]:sear6.fo.x.y <<< -<<<<<<< HEAD -size: 12016 -location: clients/tests/test-client.py:1063:test_004()/807 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 12220 -location: clients/tests/test-client.py:1063:test_004()/807 -======= -size: 12215 +size: 12011 location: clients/tests/test-client.py:test_004()/807 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f all dev show lang: C returncode: 0 @@ -47682,16 +45626,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 12062 -location: clients/tests/test-client.py:1063:test_004()/808 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 12266 -location: clients/tests/test-client.py:1063:test_004()/808 -======= -size: 12261 +size: 12057 location: clients/tests/test-client.py:test_004()/808 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -48148,16 +46084,8 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -<<<<<<< HEAD -size: 2734 -location: clients/tests/test-client.py:1069:test_004()/811 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2852 -location: clients/tests/test-client.py:1069:test_004()/811 -======= -size: 2847 +size: 2729 location: clients/tests/test-client.py:test_004()/811 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f all dev show wlan0 lang: C returncode: 0 @@ -48257,16 +46185,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2771 -location: clients/tests/test-client.py:1069:test_004()/812 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2889 -location: clients/tests/test-client.py:1069:test_004()/812 -======= -size: 2884 +size: 2766 location: clients/tests/test-client.py:test_004()/812 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -48366,16 +46286,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1232 -location: clients/tests/test-client.py:1072:test_004()/813 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1260 -location: clients/tests/test-client.py:1072:test_004()/813 -======= -size: 1255 +size: 1227 location: clients/tests/test-client.py:test_004()/813 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -48420,16 +46332,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1242 -location: clients/tests/test-client.py:1072:test_004()/814 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1270 -location: clients/tests/test-client.py:1072:test_004()/814 -======= -size: 1265 +size: 1237 location: clients/tests/test-client.py:test_004()/814 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -48474,16 +46378,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1232 -location: clients/tests/test-client.py:1075:test_004()/815 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1260 -location: clients/tests/test-client.py:1075:test_004()/815 -======= -size: 1255 +size: 1227 location: clients/tests/test-client.py:test_004()/815 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -48528,16 +46424,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1242 -location: clients/tests/test-client.py:1075:test_004()/816 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1270 -location: clients/tests/test-client.py:1075:test_004()/816 -======= -size: 1265 +size: 1237 location: clients/tests/test-client.py:test_004()/816 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -48788,16 +46676,8 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< -<<<<<<< HEAD -size: 552 -location: clients/tests/test-client.py:1083:test_004()/821 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 648 -location: clients/tests/test-client.py:1083:test_004()/821 -======= -size: 643 +size: 547 location: clients/tests/test-client.py:test_004()/821 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list lang: C returncode: 0 @@ -48839,16 +46719,8 @@ SECURITY:WPA1 WPA2 <<< -<<<<<<< HEAD -size: 598 -location: clients/tests/test-client.py:1083:test_004()/822 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 694 -location: clients/tests/test-client.py:1083:test_004()/822 -======= -size: 689 +size: 593 location: clients/tests/test-client.py:test_004()/822 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -49104,16 +46976,8 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< -<<<<<<< HEAD -size: 294 -location: clients/tests/test-client.py:1090:test_004()/827 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 319 -location: clients/tests/test-client.py:1090:test_004()/827 -======= -size: 314 +size: 289 location: clients/tests/test-client.py:test_004()/827 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -49131,16 +46995,8 @@ SECURITY:WPA1 WPA2 <<< -<<<<<<< HEAD -size: 314 -location: clients/tests/test-client.py:1090:test_004()/828 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 338 -location: clients/tests/test-client.py:1090:test_004()/828 -======= -size: 333 +size: 309 location: clients/tests/test-client.py:test_004()/828 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -49214,16 +47070,8 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< -<<<<<<< HEAD -size: 2737 -location: clients/tests/test-client.py:1095:test_004()/831 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2855 -location: clients/tests/test-client.py:1095:test_004()/831 -======= -size: 2850 +size: 2732 location: clients/tests/test-client.py:test_004()/831 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: C returncode: 0 @@ -49323,16 +47171,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2774 -location: clients/tests/test-client.py:1095:test_004()/832 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2892 -location: clients/tests/test-client.py:1095:test_004()/832 -======= -size: 2887 +size: 2769 location: clients/tests/test-client.py:test_004()/832 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -49498,16 +47338,8 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -<<<<<<< HEAD -size: 2875 -location: clients/tests/test-client.py:1099:test_004()/835 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 2993 -location: clients/tests/test-client.py:1099:test_004()/835 -======= -size: 2988 +size: 2870 location: clients/tests/test-client.py:test_004()/835 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -49607,16 +47439,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2912 -location: clients/tests/test-client.py:1099:test_004()/836 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3030 -location: clients/tests/test-client.py:1099:test_004()/836 -======= -size: 3025 +size: 2907 location: clients/tests/test-client.py:test_004()/836 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output 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 @@ -50896,16 +48720,8 @@ IP6.DNS[1]:2001:a::2934:bd66:550d:ec19 IP6.DOMAIN[1]:sear6.fo.x.y <<< -<<<<<<< HEAD -size: 12316 -location: clients/tests/test-client.py:1063:test_004()/855 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 12556 -location: clients/tests/test-client.py:1063:test_004()/855 -======= -size: 12551 +size: 12311 location: clients/tests/test-client.py:test_004()/855 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f all dev show lang: C returncode: 0 @@ -51296,16 +49112,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 12362 -location: clients/tests/test-client.py:1063:test_004()/856 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 12602 -location: clients/tests/test-client.py:1063:test_004()/856 -======= -size: 12597 +size: 12357 location: clients/tests/test-client.py:test_004()/856 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f all dev show lang: pl_PL.UTF-8 returncode: 0 @@ -51762,16 +49570,8 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -<<<<<<< HEAD -size: 2962 -location: clients/tests/test-client.py:1069:test_004()/859 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3107 -location: clients/tests/test-client.py:1069:test_004()/859 -======= -size: 3102 +size: 2957 location: clients/tests/test-client.py:test_004()/859 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0 lang: C returncode: 0 @@ -51871,16 +49671,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 2999 -location: clients/tests/test-client.py:1069:test_004()/860 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3144 -location: clients/tests/test-client.py:1069:test_004()/860 -======= -size: 3139 +size: 2994 location: clients/tests/test-client.py:test_004()/860 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f all dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -51980,16 +49772,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 1244 -location: clients/tests/test-client.py:1072:test_004()/861 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1272 -location: clients/tests/test-client.py:1072:test_004()/861 -======= -size: 1267 +size: 1239 location: clients/tests/test-client.py:test_004()/861 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -52034,16 +49818,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1254 -location: clients/tests/test-client.py:1072:test_004()/862 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1282 -location: clients/tests/test-client.py:1072:test_004()/862 -======= -size: 1277 +size: 1249 location: clients/tests/test-client.py:test_004()/862 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -52088,16 +49864,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1244 -location: clients/tests/test-client.py:1075:test_004()/863 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1272 -location: clients/tests/test-client.py:1075:test_004()/863 -======= -size: 1267 +size: 1239 location: clients/tests/test-client.py:test_004()/863 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: C returncode: 0 @@ -52142,16 +49910,8 @@ WIFI-PROPERTIES.5GHZ:unknown WIFI-PROPERTIES.MESH:no <<< -<<<<<<< HEAD -size: 1254 -location: clients/tests/test-client.py:1075:test_004()/864 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1282 -location: clients/tests/test-client.py:1075:test_004()/864 -======= -size: 1277 +size: 1249 location: clients/tests/test-client.py:test_004()/864 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES dev show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -52402,16 +50162,8 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/4 <<< -<<<<<<< HEAD -size: 852 -location: clients/tests/test-client.py:1083:test_004()/869 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 984 -location: clients/tests/test-client.py:1083:test_004()/869 -======= -size: 979 +size: 847 location: clients/tests/test-client.py:test_004()/869 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list lang: C returncode: 0 @@ -52453,16 +50205,8 @@ SECURITY:WPA1 WPA2 <<< -<<<<<<< HEAD -size: 898 -location: clients/tests/test-client.py:1083:test_004()/870 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 1030 -location: clients/tests/test-client.py:1083:test_004()/870 -======= -size: 1025 +size: 893 location: clients/tests/test-client.py:test_004()/870 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list lang: pl_PL.UTF-8 returncode: 0 @@ -52718,16 +50462,8 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< -<<<<<<< HEAD -size: 379 -location: clients/tests/test-client.py:1090:test_004()/875 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 412 -location: clients/tests/test-client.py:1090:test_004()/875 -======= -size: 407 +size: 374 location: clients/tests/test-client.py:test_004()/875 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: C returncode: 0 @@ -52745,16 +50481,8 @@ SECURITY:WPA1 WPA2 <<< -<<<<<<< HEAD -size: 398 -location: clients/tests/test-client.py:1090:test_004()/876 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 431 -location: clients/tests/test-client.py:1090:test_004()/876 -======= -size: 426 +size: 393 location: clients/tests/test-client.py:test_004()/876 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f COMMON device wifi list bssid C0:E2:BE:E8:EF:B6 lang: pl_PL.UTF-8 returncode: 0 @@ -52828,16 +50556,8 @@ DBUS-PATH:/org/freedesktop/NetworkManager/AccessPoint/2 <<< -<<<<<<< HEAD -size: 2965 -location: clients/tests/test-client.py:1095:test_004()/879 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3110 -location: clients/tests/test-client.py:1095:test_004()/879 -======= -size: 3105 +size: 2960 location: clients/tests/test-client.py:test_004()/879 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: C returncode: 0 @@ -52937,16 +50657,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 3002 -location: clients/tests/test-client.py:1095:test_004()/880 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3147 -location: clients/tests/test-client.py:1095:test_004()/880 -======= -size: 3142 +size: 2997 location: clients/tests/test-client.py:test_004()/880 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -f ALL device show wlan0 lang: pl_PL.UTF-8 returncode: 0 @@ -53112,16 +50824,8 @@ IP6.DOMAIN[5]:sear6.foo3.bar IP6.DOMAIN[6]:sear6.foo4.bar <<< -<<<<<<< HEAD -size: 3103 -location: clients/tests/test-client.py:1099:test_004()/883 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3248 -location: clients/tests/test-client.py:1099:test_004()/883 -======= -size: 3243 +size: 3098 location: clients/tests/test-client.py:test_004()/883 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -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 @@ -53221,16 +50925,8 @@ CONNECTIONS.AVAILABLE-CONNECTION-PATHS:/org/freedesktop/NetworkManager/Settings/ CONNECTIONS.AVAILABLE-CONNECTIONS[1]:UUID-con-xx1-REPLACED-REPLACED-REPLA | con-xx1 <<< -<<<<<<< HEAD -size: 3140 -location: clients/tests/test-client.py:1099:test_004()/884 -||||||| parent of ad3ef326aa7a... clients/tests: don't include the source line number with client tests output -size: 3285 -location: clients/tests/test-client.py:1099:test_004()/884 -======= -size: 3280 +size: 3135 location: clients/tests/test-client.py:test_004()/884 ->>>>>>> ad3ef326aa7a... clients/tests: don't include the source line number with client tests output cmd: $NMCLI --mode multiline --terse --color yes -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