diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-05-14 16:33:10 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-05-14 17:53:03 +0200 |
| commit | 7224461069ab4a1f864e48a2253c1581520a28d7 (patch) | |
| tree | 541c6deba9617c772980eaec75ddc3600afc65a2 | |
| parent | 0d302caab8f01cb055d8a0081be0fb10c15fe076 (diff) | |
| download | NetworkManager-7224461069ab4a1f864e48a2253c1581520a28d7.tar.gz | |
clients/tests: add more checks for output of nmcli by language
Let the computer do the hard stuff. Since we already call the tests,
why only check for one language?
64 files changed, 1086 insertions, 382 deletions
diff --git a/Makefile.am b/Makefile.am index 2c83106702..26ac99b9d9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3810,6 +3810,12 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_001-004.expected \ clients/tests/test-client.check-on-disk/test_001-005.expected \ clients/tests/test-client.check-on-disk/test_001-006.expected \ + clients/tests/test-client.check-on-disk/test_001-007.expected \ + clients/tests/test-client.check-on-disk/test_001-008.expected \ + clients/tests/test-client.check-on-disk/test_001-009.expected \ + clients/tests/test-client.check-on-disk/test_001-010.expected \ + clients/tests/test-client.check-on-disk/test_001-011.expected \ + clients/tests/test-client.check-on-disk/test_001-012.expected \ clients/tests/test-client.check-on-disk/test_002-001.expected \ clients/tests/test-client.check-on-disk/test_002-002.expected \ clients/tests/test-client.check-on-disk/test_002-003.expected \ @@ -3828,6 +3834,24 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_002-016.expected \ clients/tests/test-client.check-on-disk/test_002-017.expected \ clients/tests/test-client.check-on-disk/test_002-018.expected \ + clients/tests/test-client.check-on-disk/test_002-019.expected \ + clients/tests/test-client.check-on-disk/test_002-020.expected \ + clients/tests/test-client.check-on-disk/test_002-021.expected \ + clients/tests/test-client.check-on-disk/test_002-022.expected \ + clients/tests/test-client.check-on-disk/test_002-023.expected \ + clients/tests/test-client.check-on-disk/test_002-024.expected \ + clients/tests/test-client.check-on-disk/test_002-025.expected \ + clients/tests/test-client.check-on-disk/test_002-026.expected \ + clients/tests/test-client.check-on-disk/test_002-027.expected \ + clients/tests/test-client.check-on-disk/test_002-028.expected \ + clients/tests/test-client.check-on-disk/test_002-029.expected \ + clients/tests/test-client.check-on-disk/test_002-030.expected \ + clients/tests/test-client.check-on-disk/test_002-031.expected \ + clients/tests/test-client.check-on-disk/test_002-032.expected \ + clients/tests/test-client.check-on-disk/test_002-033.expected \ + clients/tests/test-client.check-on-disk/test_002-034.expected \ + clients/tests/test-client.check-on-disk/test_002-035.expected \ + clients/tests/test-client.check-on-disk/test_002-036.expected \ clients/tests/test-client.check-on-disk/test_003-001.expected \ clients/tests/test-client.check-on-disk/test_003-002.expected \ clients/tests/test-client.check-on-disk/test_003-003.expected \ @@ -3836,6 +3860,12 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_003-006.expected \ clients/tests/test-client.check-on-disk/test_003-007.expected \ clients/tests/test-client.check-on-disk/test_003-008.expected \ + clients/tests/test-client.check-on-disk/test_003-009.expected \ + clients/tests/test-client.check-on-disk/test_003-010.expected \ + clients/tests/test-client.check-on-disk/test_003-011.expected \ + clients/tests/test-client.check-on-disk/test_003-012.expected \ + clients/tests/test-client.check-on-disk/test_003-013.expected \ + clients/tests/test-client.check-on-disk/test_003-014.expected \ \ $(NULL) diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected index f3e8cf37ab..a6490d2e6a 100644 --- a/clients/tests/test-client.check-on-disk/test_001-001.expected +++ b/clients/tests/test-client.check-on-disk/test_001-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:489:test_001()/1 +location: clients/tests/test-client.py:543:test_001()/1 cmd: $NMCLI lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-002.expected b/clients/tests/test-client.check-on-disk/test_001-002.expected index 357cf3911b..03107ea54e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-002.expected +++ b/clients/tests/test-client.check-on-disk/test_001-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:490:test_001()/2 +location: clients/tests/test-client.py:543:test_001()/2 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-003.expected b/clients/tests/test-client.check-on-disk/test_001-003.expected index ea06b8d0bb..5bbd500b4e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-003.expected +++ b/clients/tests/test-client.check-on-disk/test_001-003.expected @@ -1,13 +1,20 @@ -location: clients/tests/test-client.py:492:test_001()/3 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: C -returncode: 10 -stdout: 0 bytes +location: clients/tests/test-client.py:543:test_001()/3 +cmd: $NMCLI +lang: de_DE.utf8 +returncode: 0 +stdout: 322 bytes >>> +DNS configuration: + servers: 1.2.3.4 5.6.7.8 + +Rufen Sie »nmcli device show« auf, um vollständige Informationen über bekannte Geräte abzurufen +und »nmcli connection show« für eine Übersicht über aktive Verbindungsprofile. + + +Die Hilfeseiten nmcli(1) und nmcli-examples(5) geben vollständige Aufrufbeschreibungen. <<< -stderr: 33 bytes +stderr: 0 bytes >>> -Error: Device 'wlan0' not found. <<< diff --git a/clients/tests/test-client.check-on-disk/test_001-004.expected b/clients/tests/test-client.check-on-disk/test_001-004.expected index 8e58d1493a..83f32d5a8f 100644 --- a/clients/tests/test-client.check-on-disk/test_001-004.expected +++ b/clients/tests/test-client.check-on-disk/test_001-004.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:493:test_001()/4 +location: clients/tests/test-client.py:545:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: de_DE.utf8 +lang: C returncode: 10 stdout: 0 bytes >>> <<< -stderr: 47 bytes +stderr: 33 bytes >>> -Fehler: Gerät »wlan0« wurde nicht gefunden. +Error: Device 'wlan0' not found. <<< diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected index c24b6cd32f..b27c224d16 100644 --- a/clients/tests/test-client.check-on-disk/test_001-005.expected +++ b/clients/tests/test-client.check-on-disk/test_001-005.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:495:test_001()/5 -cmd: $NMCLI c s -lang: C -returncode: 0 -stdout: 26 bytes +location: clients/tests/test-client.py:545:test_001()/5 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: pl_PL.UTF-8 +returncode: 10 +stdout: 0 bytes >>> -NAME UUID TYPE DEVICE <<< -stderr: 0 bytes +stderr: 49 bytes >>> +Błąd: Nie odnaleziono urządzenia „wlan0”. <<< diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected index 66c0e9917d..724e80e1f5 100644 --- a/clients/tests/test-client.check-on-disk/test_001-006.expected +++ b/clients/tests/test-client.check-on-disk/test_001-006.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:497:test_001()/6 -cmd: $NMCLI bogus s -lang: C -returncode: 2 +location: clients/tests/test-client.py:545:test_001()/6 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: de_DE.utf8 +returncode: 10 stdout: 0 bytes >>> <<< -stderr: 68 bytes +stderr: 47 bytes >>> -Error: argument 'bogus' not understood. Try passing --help instead. +Fehler: Gerät »wlan0« wurde nicht gefunden. <<< diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected new file mode 100644 index 0000000000..56dc92a366 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:547:test_001()/7 +cmd: $NMCLI c s +lang: C +returncode: 0 +stdout: 26 bytes +>>> +NAME UUID TYPE DEVICE + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected new file mode 100644 index 0000000000..e2da59bd10 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:547:test_001()/8 +cmd: $NMCLI c s +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 26 bytes +>>> +NAME UUID TYPE DEVICE + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected new file mode 100644 index 0000000000..967df95b2a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-009.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:547:test_001()/9 +cmd: $NMCLI c s +lang: de_DE.utf8 +returncode: 0 +stdout: 26 bytes +>>> +NAME UUID TYPE DEVICE + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected new file mode 100644 index 0000000000..876f8c52c3 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-010.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:549:test_001()/10 +cmd: $NMCLI bogus s +lang: C +returncode: 2 +stdout: 0 bytes +>>> + +<<< +stderr: 68 bytes +>>> +Error: argument 'bogus' not understood. Try passing --help instead. + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected new file mode 100644 index 0000000000..95101af11d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:549:test_001()/11 +cmd: $NMCLI bogus s +lang: pl_PL.UTF-8 +returncode: 2 +stdout: 0 bytes +>>> + +<<< +stderr: 87 bytes +>>> +Błąd: nie zrozumiano parametru „bogus”. Można użyć „--help” zamiast tego. + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected new file mode 100644 index 0000000000..f2acfca91d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:549:test_001()/12 +cmd: $NMCLI bogus s +lang: de_DE.utf8 +returncode: 2 +stdout: 0 bytes +>>> + +<<< +stderr: 88 bytes +>>> +Fehler: Argument »bogus« wird nicht verstanden. Versuchen Sie stattdessen »--help«. + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-001.expected b/clients/tests/test-client.check-on-disk/test_002-001.expected index bc0d4f5dd9..c1f8737afa 100644 --- a/clients/tests/test-client.check-on-disk/test_002-001.expected +++ b/clients/tests/test-client.check-on-disk/test_002-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:502:test_002()/1 +location: clients/tests/test-client.py:554:test_002()/1 cmd: $NMCLI d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-002.expected b/clients/tests/test-client.check-on-disk/test_002-002.expected index d516e2f849..a05f585c72 100644 --- a/clients/tests/test-client.check-on-disk/test_002-002.expected +++ b/clients/tests/test-client.check-on-disk/test_002-002.expected @@ -1,14 +1,14 @@ -location: clients/tests/test-client.py:504:test_002()/2 -cmd: $NMCLI -f all d -lang: C +location: clients/tests/test-client.py:554:test_002()/2 +cmd: $NMCLI d +lang: pl_PL.UTF-8 returncode: 0 -stdout: 530 bytes +stdout: 219 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 -- -- -- -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +DEVICE TYPE STATE CONNECTION +eth0 ethernet niedostępne -- +wlan0 wifi niedostępne -- +wlan1 wifi niedostępne -- +wlan1 wifi niedostępne -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected index ff88393cc6..bea81cdb74 100644 --- a/clients/tests/test-client.check-on-disk/test_002-003.expected +++ b/clients/tests/test-client.check-on-disk/test_002-003.expected @@ -1,32 +1,14 @@ -location: clients/tests/test-client.py:506:test_002()/3 -cmd: $NMCLI -lang: C +location: clients/tests/test-client.py:554:test_002()/3 +cmd: $NMCLI d +lang: de_DE.utf8 returncode: 0 -stdout: 551 bytes +stdout: 239 bytes >>> -eth0: unavailable - "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, hw - -wlan0: unavailable - "wlan0" - wifi (virtual), 5A:88:5E:B6:90:40, hw - -wlan1: unavailable - "wlan1" - wifi (virtual), 7C:D4:69:31:67:0B, hw - -wlan1: unavailable - "wlan1" - wifi (virtual), 41:21:6B:F3:C9:4A, hw - -DNS configuration: - servers: 1.2.3.4 5.6.7.8 - -Use "nmcli device show" to get complete information about known devices and -"nmcli connection show" to get an overview on active connection profiles. - -Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details. +DEVICE TYPE STATE CONNECTION +eth0 ethernet nicht verfügbar -- +wlan0 wifi nicht verfügbar -- +wlan1 wifi nicht verfügbar -- +wlan1 wifi nicht verfügbar -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected index b523237604..381bff9996 100644 --- a/clients/tests/test-client.check-on-disk/test_002-004.expected +++ b/clients/tests/test-client.check-on-disk/test_002-004.expected @@ -1,33 +1,14 @@ -location: clients/tests/test-client.py:508:test_002()/4 -cmd: $NMCLI -f AP -mode multiline d show wlan0 +location: clients/tests/test-client.py:556:test_002()/4 +cmd: $NMCLI -f all d lang: C returncode: 0 -stdout: 1107 bytes +stdout: 530 bytes >>> -AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infra -AP[1].CHAN: 1 -AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** -AP[1].SECURITY: WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infra -AP[2].CHAN: 1 -AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** -AP[2].SECURITY: WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infra -AP[3].CHAN: 1 -AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * -AP[3].SECURITY: WPA1 WPA2 +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 -- -- -- +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected index 2d483c31c8..9bc51b99b4 100644 --- a/clients/tests/test-client.check-on-disk/test_002-005.expected +++ b/clients/tests/test-client.check-on-disk/test_002-005.expected @@ -1,39 +1,14 @@ -location: clients/tests/test-client.py:509:test_002()/5 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: C +location: clients/tests/test-client.py:556:test_002()/5 +cmd: $NMCLI -f all d +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1558 bytes +stdout: 534 bytes >>> -=============================================================================== - Device details (wlan0) -=============================================================================== -AP[1].IN-USE: -AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infra -AP[1].CHAN: 1 -AP[1].RATE: 54 Mbit/s -AP[1].SIGNAL: 88 -AP[1].BARS: **** -AP[1].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- -AP[2].IN-USE: -AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infra -AP[2].CHAN: 1 -AP[2].RATE: 54 Mbit/s -AP[2].SIGNAL: 61 -AP[2].BARS: *** -AP[2].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- -AP[3].IN-USE: -AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infra -AP[3].CHAN: 1 -AP[3].RATE: 54 Mbit/s -AP[3].SIGNAL: 29 -AP[3].BARS: * -AP[3].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 -- -- -- +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected index 4c7d82697e..f97b23a2a3 100644 --- a/clients/tests/test-client.check-on-disk/test_002-006.expected +++ b/clients/tests/test-client.check-on-disk/test_002-006.expected @@ -1,33 +1,14 @@ -location: clients/tests/test-client.py:510:test_002()/6 -cmd: $NMCLI -f AP -mode multiline -t d show wlan0 -lang: C +location: clients/tests/test-client.py:556:test_002()/6 +cmd: $NMCLI -f all d +lang: de_DE.utf8 returncode: 0 -stdout: 435 bytes +stdout: 554 bytes >>> -AP[1].IN-USE: -AP[1].SSID:wlan0-ap-3 -AP[1].MODE:Infra -AP[1].CHAN:1 -AP[1].RATE:54 Mbit/s -AP[1].SIGNAL:88 -AP[1].BARS:**** -AP[1].SECURITY:WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID:wlan0-ap-2 -AP[2].MODE:Infra -AP[2].CHAN:1 -AP[2].RATE:54 Mbit/s -AP[2].SIGNAL:61 -AP[2].BARS:*** -AP[2].SECURITY:WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID:wlan0-ap-1 -AP[3].MODE:Infra -AP[3].CHAN:1 -AP[3].RATE:54 Mbit/s -AP[3].SIGNAL:29 -AP[3].BARS:* -AP[3].SECURITY:WPA1 WPA2 +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 -- -- -- +wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected index d2fdce1642..5b0e5d81e2 100644 --- a/clients/tests/test-client.check-on-disk/test_002-007.expected +++ b/clients/tests/test-client.check-on-disk/test_002-007.expected @@ -1,13 +1,32 @@ -location: clients/tests/test-client.py:511:test_002()/7 -cmd: $NMCLI -f AP -mode tabular d show wlan0 +location: clients/tests/test-client.py:558:test_002()/7 +cmd: $NMCLI lang: C returncode: 0 -stdout: 304 bytes +stdout: 551 bytes >>> -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +eth0: unavailable + "eth0" + ethernet (virtual), 72:41:AB:90:41:5D, hw + +wlan0: unavailable + "wlan0" + wifi (virtual), 5A:88:5E:B6:90:40, hw + +wlan1: unavailable + "wlan1" + wifi (virtual), 7C:D4:69:31:67:0B, hw + +wlan1: unavailable + "wlan1" + wifi (virtual), 41:21:6B:F3:C9:4A, hw + +DNS configuration: + servers: 1.2.3.4 5.6.7.8 + +Use "nmcli device show" to get complete information about known devices and +"nmcli connection show" to get an overview on active connection profiles. + +Consult nmcli(1) and nmcli-examples(5) manual pages for complete usage details. <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected index 830f273ee9..8c8e0d8266 100644 --- a/clients/tests/test-client.check-on-disk/test_002-008.expected +++ b/clients/tests/test-client.check-on-disk/test_002-008.expected @@ -1,17 +1,34 @@ -location: clients/tests/test-client.py:512:test_002()/8 -cmd: $NMCLI -f AP -mode tabular -p d show wlan0 -lang: C +location: clients/tests/test-client.py:558:test_002()/8 +cmd: $NMCLI +lang: pl_PL.UTF-8 returncode: 0 -stdout: 460 bytes +stdout: 608 bytes >>> -========================== - Device details (wlan0) -========================== -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ----------------------------------------------------------------------------- -AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 +eth0: niedostępne + "eth0" + ethernet (virtual), 72:41:AB:90:41:5D, sprzęt + +wlan0: niedostępne + "wlan0" + wifi (virtual), 5A:88:5E:B6:90:40, sprzęt + +wlan1: niedostępne + "wlan1" + wifi (virtual), 7C:D4:69:31:67:0B, sprzęt + +wlan1: niedostępne + "wlan1" + wifi (virtual), 41:21:6B:F3:C9:4A, sprzęt + +DNS configuration: + servers: 1.2.3.4 5.6.7.8 + +Polecenie „nmcli device show” wyświetli pełne informacje o znanych +urządzeniach, a „nmcli connection show” wyświetli przegląd aktywnych +profili połączeń. + +Strony podręcznika nmcli(1) i nmcli-examples(5) zawierają pełne informacje +o użyciu. <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected index a04afd3c3d..c505b76b59 100644 --- a/clients/tests/test-client.check-on-disk/test_002-009.expected +++ b/clients/tests/test-client.check-on-disk/test_002-009.expected @@ -1,12 +1,33 @@ -location: clients/tests/test-client.py:513:test_002()/9 -cmd: $NMCLI -f AP -mode tabular -t d show wlan0 -lang: C +location: clients/tests/test-client.py:558:test_002()/9 +cmd: $NMCLI +lang: de_DE.utf8 returncode: 0 -stdout: 165 bytes +stdout: 616 bytes >>> -AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2 -AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2 -AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2 +eth0: nicht verfügbar + "eth0" + ethernet (virtual), 72:41:AB:90:41:5D, hw + +wlan0: nicht verfügbar + "wlan0" + wifi (virtual), 5A:88:5E:B6:90:40, hw + +wlan1: nicht verfügbar + "wlan1" + wifi (virtual), 7C:D4:69:31:67:0B, hw + +wlan1: nicht verfügbar + "wlan1" + wifi (virtual), 41:21:6B:F3:C9:4A, hw + +DNS configuration: + servers: 1.2.3.4 5.6.7.8 + +Rufen Sie »nmcli device show« auf, um vollständige Informationen über bekannte Geräte abzurufen +und »nmcli connection show« für eine Übersicht über aktive Verbindungsprofile. + + +Die Hilfeseiten nmcli(1) und nmcli-examples(5) geben vollständige Aufrufbeschreibungen. <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected index 2382f7dc42..8167d6bc1f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-010.expected +++ b/clients/tests/test-client.check-on-disk/test_002-010.expected @@ -1,30 +1,30 @@ -location: clients/tests/test-client.py:515:test_002()/10 +location: clients/tests/test-client.py:560:test_002()/10 cmd: $NMCLI -f AP -mode multiline d show wlan0 -lang: pl_PL.UTF-8 +lang: C returncode: 0 -stdout: 1134 bytes +stdout: 1107 bytes >>> AP[1].IN-USE: AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infrastruktura +AP[1].MODE: Infra AP[1].CHAN: 1 -AP[1].RATE: 54 Mb/s +AP[1].RATE: 54 Mbit/s AP[1].SIGNAL: 88 AP[1].BARS: **** AP[1].SECURITY: WPA1 WPA2 AP[2].IN-USE: AP[2].SSID: wlan0-ap-2 -AP[2].MODE: Infrastruktura +AP[2].MODE: Infra AP[2].CHAN: 1 -AP[2].RATE: 54 Mb/s +AP[2].RATE: 54 Mbit/s AP[2].SIGNAL: 61 AP[2].BARS: *** AP[2].SECURITY: WPA1 WPA2 AP[3].IN-USE: AP[3].SSID: wlan0-ap-1 -AP[3].MODE: Infrastruktura +AP[3].MODE: Infra AP[3].CHAN: 1 -AP[3].RATE: 54 Mb/s +AP[3].RATE: 54 Mbit/s AP[3].SIGNAL: 29 AP[3].BARS: * AP[3].SECURITY: WPA1 WPA2 diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected index 6ea17122eb..6e705a9097 100644 --- a/clients/tests/test-client.check-on-disk/test_002-011.expected +++ b/clients/tests/test-client.check-on-disk/test_002-011.expected @@ -1,12 +1,9 @@ -location: clients/tests/test-client.py:516:test_002()/11 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +location: clients/tests/test-client.py:560:test_002()/11 +cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1592 bytes +stdout: 1134 bytes >>> -=============================================================================== - Informacje o urządzeniu (wlan0) -=============================================================================== AP[1].IN-USE: AP[1].SSID: wlan0-ap-3 AP[1].MODE: Infrastruktura @@ -15,7 +12,6 @@ AP[1].RATE: 54 Mb/s AP[1].SIGNAL: 88 AP[1].BARS: **** AP[1].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- AP[2].IN-USE: AP[2].SSID: wlan0-ap-2 AP[2].MODE: Infrastruktura @@ -24,7 +20,6 @@ AP[2].RATE: 54 Mb/s AP[2].SIGNAL: 61 AP[2].BARS: *** AP[2].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- AP[3].IN-USE: AP[3].SSID: wlan0-ap-1 AP[3].MODE: Infrastruktura @@ -33,7 +28,6 @@ AP[3].RATE: 54 Mb/s AP[3].SIGNAL: 29 AP[3].BARS: * AP[3].SECURITY: WPA1 WPA2 -------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected index 8a30d1320c..836310387d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-012.expected +++ b/clients/tests/test-client.check-on-disk/test_002-012.expected @@ -1,33 +1,33 @@ -location: clients/tests/test-client.py:517:test_002()/12 -cmd: $NMCLI -f AP -mode multiline -t d show wlan0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:560:test_002()/12 +cmd: $NMCLI -f AP -mode multiline d show wlan0 +lang: de_DE.utf8 returncode: 0 -stdout: 462 bytes +stdout: 1107 bytes >>> -AP[1].IN-USE: -AP[1].SSID:wlan0-ap-3 -AP[1].MODE:Infrastruktura -AP[1].CHAN:1 -AP[1].RATE:54 Mb/s -AP[1].SIGNAL:88 -AP[1].BARS:**** -AP[1].SECURITY:WPA1 WPA2 -AP[2].IN-USE: -AP[2].SSID:wlan0-ap-2 -AP[2].MODE:Infrastruktura -AP[2].CHAN:1 -AP[2].RATE:54 Mb/s -AP[2].SIGNAL:61 -AP[2].BARS:*** -AP[2].SECURITY:WPA1 WPA2 -AP[3].IN-USE: -AP[3].SSID:wlan0-ap-1 -AP[3].MODE:Infrastruktura -AP[3].CHAN:1 -AP[3].RATE:54 Mb/s -AP[3].SIGNAL:29 -AP[3].BARS:* -AP[3].SECURITY:WPA1 WPA2 +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-3 +AP[1].MODE: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 88 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-2 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 61 +AP[2].BARS: *** +AP[2].SECURITY: WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-1 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 29 +AP[3].BARS: * +AP[3].SECURITY: WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected index cbb8d44412..dc134b9929 100644 --- a/clients/tests/test-client.check-on-disk/test_002-013.expected +++ b/clients/tests/test-client.check-on-disk/test_002-013.expected @@ -1,13 +1,39 @@ -location: clients/tests/test-client.py:518:test_002()/13 -cmd: $NMCLI -f AP -mode tabular d show wlan0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:561:test_002()/13 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: C returncode: 0 -stdout: 338 bytes +stdout: 1558 bytes >>> -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY -AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 +=============================================================================== + Device details (wlan0) +=============================================================================== +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-3 +AP[1].MODE: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 88 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-2 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 61 +AP[2].BARS: *** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-1 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 29 +AP[3].BARS: * +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected index 92cd1f3002..2ce1dd5b5e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-014.expected +++ b/clients/tests/test-client.check-on-disk/test_002-014.expected @@ -1,17 +1,39 @@ -location: clients/tests/test-client.py:519:test_002()/14 -cmd: $NMCLI -f AP -mode tabular -p d show wlan0 +location: clients/tests/test-client.py:561:test_002()/14 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 530 bytes +stdout: 1592 bytes >>> -=================================== - Informacje o urządzeniu (wlan0) -=================================== -NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY ------------------------------------------------------------------------------------ -AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 -AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 -AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 +=============================================================================== + Informacje o urządzeniu (wlan0) +=============================================================================== +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-3 +AP[1].MODE: Infrastruktura +AP[1].CHAN: 1 +AP[1].RATE: 54 Mb/s +AP[1].SIGNAL: 88 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-2 +AP[2].MODE: Infrastruktura +AP[2].CHAN: 1 +AP[2].RATE: 54 Mb/s +AP[2].SIGNAL: 61 +AP[2].BARS: *** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-1 +AP[3].MODE: Infrastruktura +AP[3].CHAN: 1 +AP[3].RATE: 54 Mb/s +AP[3].SIGNAL: 29 +AP[3].BARS: * +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected index b466877fcb..31774e7711 100644 --- a/clients/tests/test-client.check-on-disk/test_002-015.expected +++ b/clients/tests/test-client.check-on-disk/test_002-015.expected @@ -1,12 +1,39 @@ -location: clients/tests/test-client.py:520:test_002()/15 -cmd: $NMCLI -f AP -mode tabular -t d show wlan0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:561:test_002()/15 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: de_DE.utf8 returncode: 0 -stdout: 192 bytes +stdout: 1562 bytes >>> -AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:88:****:WPA1 WPA2 -AP[2]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:61:*** :WPA1 WPA2 -AP[3]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:29:* :WPA1 WPA2 +=============================================================================== + Geräteinformationen (wlan0) +=============================================================================== +AP[1].IN-USE: +AP[1].SSID: wlan0-ap-3 +AP[1].MODE: Infra +AP[1].CHAN: 1 +AP[1].RATE: 54 Mbit/s +AP[1].SIGNAL: 88 +AP[1].BARS: **** +AP[1].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[2].IN-USE: +AP[2].SSID: wlan0-ap-2 +AP[2].MODE: Infra +AP[2].CHAN: 1 +AP[2].RATE: 54 Mbit/s +AP[2].SIGNAL: 61 +AP[2].BARS: *** +AP[2].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- +AP[3].IN-USE: +AP[3].SSID: wlan0-ap-1 +AP[3].MODE: Infra +AP[3].CHAN: 1 +AP[3].RATE: 54 Mbit/s +AP[3].SIGNAL: 29 +AP[3].BARS: * +AP[3].SECURITY: WPA1 WPA2 +------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected index 66e344e970..74e46abfaf 100644 --- a/clients/tests/test-client.check-on-disk/test_002-016.expected +++ b/clients/tests/test-client.check-on-disk/test_002-016.expected @@ -1,18 +1,33 @@ -location: clients/tests/test-client.py:522:test_002()/16 -cmd: $NMCLI -f ALL d wifi +location: clients/tests/test-client.py:562:test_002()/16 +cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 -stdout: 1840 bytes +stdout: 435 bytes >>> -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 -AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 -AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 - -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH -AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 - -NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1].IN-USE: +AP[1].SSID:wlan0-ap-3 +AP[1].MODE:Infra +AP[1].CHAN:1 +AP[1].RATE:54 Mbit/s +AP[1].SIGNAL:88 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-2 +AP[2].MODE:Infra +AP[2].CHAN:1 +AP[2].RATE:54 Mbit/s +AP[2].SIGNAL:61 +AP[2].BARS:*** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-1 +AP[3].MODE:Infra +AP[3].CHAN:1 +AP[3].RATE:54 Mbit/s +AP[3].SIGNAL:29 +AP[3].BARS:* +AP[3].SECURITY:WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected index 360a5d6cff..abe9fab09f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-017.expected +++ b/clients/tests/test-client.check-on-disk/test_002-017.expected @@ -1,11 +1,33 @@ -location: clients/tests/test-client.py:524:test_002()/17 -cmd: $NMCLI c -lang: C +location: clients/tests/test-client.py:562:test_002()/17 +cmd: $NMCLI -f AP -mode multiline -t d show wlan0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 126 bytes +stdout: 462 bytes >>> -NAME UUID TYPE DEVICE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +AP[1].IN-USE: +AP[1].SSID:wlan0-ap-3 +AP[1].MODE:Infrastruktura +AP[1].CHAN:1 +AP[1].RATE:54 Mb/s +AP[1].SIGNAL:88 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-2 +AP[2].MODE:Infrastruktura +AP[2].CHAN:1 +AP[2].RATE:54 Mb/s +AP[2].SIGNAL:61 +AP[2].BARS:*** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-1 +AP[3].MODE:Infrastruktura +AP[3].CHAN:1 +AP[3].RATE:54 Mb/s +AP[3].SIGNAL:29 +AP[3].BARS:* +AP[3].SECURITY:WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected index 79fc4b4929..15972d961d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-018.expected +++ b/clients/tests/test-client.check-on-disk/test_002-018.expected @@ -1,30 +1,33 @@ -location: clients/tests/test-client.py:526:test_002()/18 -cmd: $NMCLI c s con-1 -lang: C +location: clients/tests/test-client.py:562:test_002()/18 +cmd: $NMCLI -f AP -mode multiline -t d show wlan0 +lang: de_DE.utf8 returncode: 0 -stdout: 990 bytes +stdout: 435 bytes >>> -connection.id: con-1 -connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) +AP[1].IN-USE: +AP[1].SSID:wlan0-ap-3 +AP[1].MODE:Infra +AP[1].CHAN:1 +AP[1].RATE:54 Mbit/s +AP[1].SIGNAL:88 +AP[1].BARS:**** +AP[1].SECURITY:WPA1 WPA2 +AP[2].IN-USE: +AP[2].SSID:wlan0-ap-2 +AP[2].MODE:Infra +AP[2].CHAN:1 +AP[2].RATE:54 Mbit/s +AP[2].SIGNAL:61 +AP[2].BARS:*** +AP[2].SECURITY:WPA1 WPA2 +AP[3].IN-USE: +AP[3].SSID:wlan0-ap-1 +AP[3].MODE:Infra +AP[3].CHAN:1 +AP[3].RATE:54 Mbit/s +AP[3].SIGNAL:29 +AP[3].BARS:* +AP[3].SECURITY:WPA1 WPA2 <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected new file mode 100644 index 0000000000..4a495e21fe --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:563:test_002()/19 +cmd: $NMCLI -f AP -mode tabular d show wlan0 +lang: C +returncode: 0 +stdout: 304 bytes +>>> +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected new file mode 100644 index 0000000000..4a9a528dc7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:563:test_002()/20 +cmd: $NMCLI -f AP -mode tabular d show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 338 bytes +>>> +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected new file mode 100644 index 0000000000..6a9ce747e4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:563:test_002()/21 +cmd: $NMCLI -f AP -mode tabular d show wlan0 +lang: de_DE.utf8 +returncode: 0 +stdout: 304 bytes +>>> +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected new file mode 100644 index 0000000000..244225addb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:564:test_002()/22 +cmd: $NMCLI -f AP -mode tabular -p d show wlan0 +lang: C +returncode: 0 +stdout: 460 bytes +>>> +========================== + Device details (wlan0) +========================== +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +---------------------------------------------------------------------------- +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected new file mode 100644 index 0000000000..8d04359192 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:564:test_002()/23 +cmd: $NMCLI -f AP -mode tabular -p d show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 530 bytes +>>> +=================================== + Informacje o urządzeniu (wlan0) +=================================== +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +----------------------------------------------------------------------------------- +AP[1] wlan0-ap-3 Infrastruktura 1 54 Mb/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infrastruktura 1 54 Mb/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infrastruktura 1 54 Mb/s 29 * WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected new file mode 100644 index 0000000000..63648ea829 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:564:test_002()/24 +cmd: $NMCLI -f AP -mode tabular -p d show wlan0 +lang: de_DE.utf8 +returncode: 0 +stdout: 476 bytes +>>> +=============================== + Geräteinformationen (wlan0) +=============================== +NAME IN-USE SSID MODE CHAN RATE SIGNAL BARS SECURITY +---------------------------------------------------------------------------- +AP[1] wlan0-ap-3 Infra 1 54 Mbit/s 88 **** WPA1 WPA2 +AP[2] wlan0-ap-2 Infra 1 54 Mbit/s 61 *** WPA1 WPA2 +AP[3] wlan0-ap-1 Infra 1 54 Mbit/s 29 * WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-025.expected b/clients/tests/test-client.check-on-disk/test_002-025.expected new file mode 100644 index 0000000000..34bc44eed2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-025.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:565:test_002()/25 +cmd: $NMCLI -f AP -mode tabular -t d show wlan0 +lang: C +returncode: 0 +stdout: 165 bytes +>>> +AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2 +AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2 +AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-026.expected b/clients/tests/test-client.check-on-disk/test_002-026.expected new file mode 100644 index 0000000000..21b3ae9993 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-026.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:565:test_002()/26 +cmd: $NMCLI -f AP -mode tabular -t d show wlan0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 192 bytes +>>> +AP[1]: :wlan0-ap-3:Infrastruktura:1:54 Mb/s:88:****:WPA1 WPA2 +AP[2]: :wlan0-ap-2:Infrastruktura:1:54 Mb/s:61:*** :WPA1 WPA2 +AP[3]: :wlan0-ap-1:Infrastruktura:1:54 Mb/s:29:* :WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-027.expected b/clients/tests/test-client.check-on-disk/test_002-027.expected new file mode 100644 index 0000000000..19f7899f29 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-027.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:565:test_002()/27 +cmd: $NMCLI -f AP -mode tabular -t d show wlan0 +lang: de_DE.utf8 +returncode: 0 +stdout: 165 bytes +>>> +AP[1]: :wlan0-ap-3:Infra:1:54 Mbit/s:88:****:WPA1 WPA2 +AP[2]: :wlan0-ap-2:Infra:1:54 Mbit/s:61:*** :WPA1 WPA2 +AP[3]: :wlan0-ap-1:Infra:1:54 Mbit/s:29:* :WPA1 WPA2 + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-028.expected b/clients/tests/test-client.check-on-disk/test_002-028.expected new file mode 100644 index 0000000000..9ec2112173 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-028.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:567:test_002()/28 +cmd: $NMCLI -f ALL d wifi +lang: C +returncode: 0 +stdout: 1840 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/3 +AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/2 +AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 no /org/freedesktop/NetworkManager/AccessPoint/1 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 no /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-029.expected b/clients/tests/test-client.check-on-disk/test_002-029.expected new file mode 100644 index 0000000000..a3f09fce81 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-029.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:567:test_002()/29 +cmd: $NMCLI -f ALL d wifi +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1898 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infrastruktura 1 2412 MHz 54 Mb/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/3 +AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infrastruktura 1 2412 MHz 54 Mb/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/2 +AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infrastruktura 1 2412 MHz 54 Mb/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nie /org/freedesktop/NetworkManager/AccessPoint/1 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infrastruktura 1 2412 MHz 54 Mb/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nie /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-030.expected b/clients/tests/test-client.check-on-disk/test_002-030.expected new file mode 100644 index 0000000000..41e1435c84 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-030.expected @@ -0,0 +1,21 @@ +location: clients/tests/test-client.py:567:test_002()/30 +cmd: $NMCLI -f ALL d wifi +lang: de_DE.utf8 +returncode: 0 +stdout: 1840 bytes +>>> +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan0-ap-3 776C616E302D61702D33 53:8C:FC:BD:7D:2B Infra 1 2412 MHz 54 Mbit/s 88 **** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nein /org/freedesktop/NetworkManager/AccessPoint/3 +AP[2] wlan0-ap-2 776C616E302D61702D32 A1:A2:78:A7:C5:D5 Infra 1 2412 MHz 54 Mbit/s 61 *** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nein /org/freedesktop/NetworkManager/AccessPoint/2 +AP[3] wlan0-ap-1 776C616E302D61702D31 81:28:C5:C2:E5:15 Infra 1 2412 MHz 54 Mbit/s 29 * WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan0 nein /org/freedesktop/NetworkManager/AccessPoint/1 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH +AP[1] wlan1-ap-4 776C616E312D61702D34 EA:62:1C:BD:C0:8F Infra 1 2412 MHz 54 Mbit/s 34 ** WPA1 WPA2 pair_tkip pair_ccmp group_tkip group_ccmp psk pair_tkip pair_ccmp group_tkip group_ccmp psk wlan1 nein /org/freedesktop/NetworkManager/AccessPoint/4 + +NAME SSID SSID-HEX BSSID MODE CHAN FREQ RATE SIGNAL BARS SECURITY WPA-FLAGS RSN-FLAGS DEVICE ACTIVE IN-USE DBUS-PATH + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-031.expected b/clients/tests/test-client.check-on-disk/test_002-031.expected new file mode 100644 index 0000000000..2dd4201c8e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-031.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:569:test_002()/31 +cmd: $NMCLI c +lang: C +returncode: 0 +stdout: 126 bytes +>>> +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-032.expected b/clients/tests/test-client.check-on-disk/test_002-032.expected new file mode 100644 index 0000000000..d6dfedab7e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-032.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:569:test_002()/32 +cmd: $NMCLI c +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 126 bytes +>>> +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-033.expected b/clients/tests/test-client.check-on-disk/test_002-033.expected new file mode 100644 index 0000000000..9a9c109cda --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-033.expected @@ -0,0 +1,14 @@ +location: clients/tests/test-client.py:569:test_002()/33 +cmd: $NMCLI c +lang: de_DE.utf8 +returncode: 0 +stdout: 126 bytes +>>> +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-034.expected b/clients/tests/test-client.check-on-disk/test_002-034.expected new file mode 100644 index 0000000000..59fc086675 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-034.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:571:test_002()/34 +cmd: $NMCLI c s con-1 +lang: C +returncode: 0 +stdout: 990 bytes +>>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-035.expected b/clients/tests/test-client.check-on-disk/test_002-035.expected new file mode 100644 index 0000000000..ec3bad7634 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-035.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:571:test_002()/35 +cmd: $NMCLI c s con-1 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 992 bytes +>>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_002-036.expected b/clients/tests/test-client.check-on-disk/test_002-036.expected new file mode 100644 index 0000000000..244facd05b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_002-036.expected @@ -0,0 +1,33 @@ +location: clients/tests/test-client.py:571:test_002()/36 +cmd: $NMCLI c s con-1 +lang: de_DE.utf8 +returncode: 0 +stdout: 993 bytes +>>> +connection.id: con-1 +connection.uuid: 5fcfd6d7-1e63-3332-8826-a7eda103792d +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: ja +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nein +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unbekannt +connection.lldp: default +connection.mdns: -1 (default) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected index ad3a214b18..a4e739c764 100644 --- a/clients/tests/test-client.check-on-disk/test_003-001.expected +++ b/clients/tests/test-client.check-on-disk/test_003-001.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:536:test_003()/1 +location: clients/tests/test-client.py:581:test_003()/1 cmd: $NMCLI c add type ethernet ifname '*' con-name con-xx1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-002.expected b/clients/tests/test-client.check-on-disk/test_003-002.expected index d3562f4a4d..21c1a23205 100644 --- a/clients/tests/test-client.check-on-disk/test_003-002.expected +++ b/clients/tests/test-client.check-on-disk/test_003-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:539:test_003()/2 +location: clients/tests/test-client.py:584:test_003()/2 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-003.expected b/clients/tests/test-client.check-on-disk/test_003-003.expected index 242a159df4..86acb7c455 100644 --- a/clients/tests/test-client.check-on-disk/test_003-003.expected +++ b/clients/tests/test-client.check-on-disk/test_003-003.expected @@ -1,10 +1,12 @@ -location: clients/tests/test-client.py:544:test_003()/3 -cmd: $NMCLI c add type ethernet ifname '*' -lang: C +location: clients/tests/test-client.py:584:test_003()/3 +cmd: $NMCLI c s +lang: pl_PL.UTF-8 returncode: 0 -stdout: 81 bytes +stdout: 195 bytes >>> -Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added. +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected index 74c395bc95..576708df2e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-004.expected +++ b/clients/tests/test-client.check-on-disk/test_003-004.expected @@ -1,13 +1,12 @@ -location: clients/tests/test-client.py:547:test_003()/4 +location: clients/tests/test-client.py:584:test_003()/4 cmd: $NMCLI c s -lang: C +lang: de_DE.utf8 returncode: 0 -stdout: 264 bytes +stdout: 195 bytes >>> -NAME UUID TYPE DEVICE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected index e1a2a90346..ca71469c7f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-005.expected +++ b/clients/tests/test-client.check-on-disk/test_003-005.expected @@ -1,13 +1,10 @@ -location: clients/tests/test-client.py:549:test_003()/5 -cmd: $NMCLI c s -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:589:test_003()/5 +cmd: $NMCLI c add type ethernet ifname '*' +lang: C returncode: 0 -stdout: 264 bytes +stdout: 81 bytes >>> -NAME UUID TYPE DEVICE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- +Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added. <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected index 7febfbefd9..80df78cb6e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-006.expected +++ b/clients/tests/test-client.check-on-disk/test_003-006.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:552:test_003()/6 -cmd: $NMCLI -f ALL c s +location: clients/tests/test-client.py:592:test_003()/6 +cmd: $NMCLI c s lang: C returncode: 0 -stdout: 912 bytes +stdout: 264 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 no -- -- -- -- +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected index f00b7b74d3..e27a081f0a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-007.expected +++ b/clients/tests/test-client.check-on-disk/test_003-007.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:554:test_003()/7 -cmd: $NMCLI -f ALL c s +location: clients/tests/test-client.py:592:test_003()/7 +cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 -stdout: 912 bytes +stdout: 264 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 nie -- -- -- -- +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected index 2318457eee..5892986b52 100644 --- a/clients/tests/test-client.check-on-disk/test_003-008.expected +++ b/clients/tests/test-client.check-on-disk/test_003-008.expected @@ -1,20 +1,14 @@ -location: clients/tests/test-client.py:558:test_003()/8 -cmd: $NMCLI --complete-args -f ALL c s '' -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:592:test_003()/8 +cmd: $NMCLI c s +lang: de_DE.utf8 returncode: 0 -stdout: 64 bytes +stdout: 264 bytes >>> +NAME UUID TYPE DEVICE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- ---active ---order -apath -con-1 -con-xx1 -ethernet -help -id -path -uuid <<< stderr: 0 bytes >>> diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected new file mode 100644 index 0000000000..85a102a392 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:595:test_003()/9 +cmd: $NMCLI -f ALL c s +lang: C +returncode: 0 +stdout: 912 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 no -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected new file mode 100644 index 0000000000..4d1b93e718 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:595:test_003()/10 +cmd: $NMCLI -f ALL c s +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 912 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 nie -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected new file mode 100644 index 0000000000..9611a18263 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:595:test_003()/11 +cmd: $NMCLI -f ALL c s +lang: de_DE.utf8 +returncode: 0 +stdout: 912 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/1 nein -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/2 nein -- -- -- -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 nein -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected new file mode 100644 index 0000000000..1a56267735 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -0,0 +1,22 @@ +location: clients/tests/test-client.py:599:test_003()/12 +cmd: $NMCLI --complete-args -f ALL c s '' +lang: C +returncode: 0 +stdout: 64 bytes +>>> + +--active +--order +apath +con-1 +con-xx1 +ethernet +help +id +path +uuid +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected new file mode 100644 index 0000000000..3fa8126ea1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -0,0 +1,22 @@ +location: clients/tests/test-client.py:599:test_003()/13 +cmd: $NMCLI --complete-args -f ALL c s '' +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 64 bytes +>>> + +--active +--order +apath +con-1 +con-xx1 +ethernet +help +id +path +uuid +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected new file mode 100644 index 0000000000..247e785f53 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -0,0 +1,22 @@ +location: clients/tests/test-client.py:599:test_003()/14 +cmd: $NMCLI --complete-args -f ALL c s '' +lang: de_DE.utf8 +returncode: 0 +stdout: 64 bytes +>>> + +--active +--order +apath +con-1 +con-xx1 +ethernet +help +id +path +uuid +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index dbb199ad63..c17540e631 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -279,8 +279,32 @@ class TestNmcli(NmTestBase): text = text2 return b''.join([(t[0] if isinstance(t, tuple) else t) for t in text]) + def call_nmcli_l(self, + args, + check_on_disk = _DEFAULT_ARG, + expected_returncode = _DEFAULT_ARG, + expected_stdout = _DEFAULT_ARG, + expected_stderr = _DEFAULT_ARG, + replace_stdout = None, + replace_stderr = None, + sort_lines_stdout = False): + frame = sys._getframe(1) + for lang in [ 'C', 'pl', 'de' ]: + self._call_nmcli(args, + lang, + check_on_disk, + expected_returncode, + expected_stdout, + expected_stderr, + replace_stdout, + replace_stderr, + sort_lines_stdout, + frame) + + def call_nmcli(self, args, + langs = None, lang = None, check_on_disk = _DEFAULT_ARG, expected_returncode = _DEFAULT_ARG, @@ -292,8 +316,38 @@ class TestNmcli(NmTestBase): frame = sys._getframe(1) - calling_fcn = frame.f_code.co_name + if langs is not None: + assert lang is None + else: + if lang is None: + lang = 'C' + langs = [lang] + + for lang in langs: + self._call_nmcli(args, + lang, + check_on_disk, + expected_returncode, + expected_stdout, + expected_stderr, + replace_stdout, + replace_stderr, + sort_lines_stdout, + frame) + + def _call_nmcli(self, + args, + lang, + check_on_disk, + expected_returncode, + expected_stdout, + expected_stderr, + replace_stdout, + replace_stderr, + sort_lines_stdout, + frame): + calling_fcn = frame.f_code.co_name calling_num = self._calling_num.get(calling_fcn, 0) + 1 self._calling_num[calling_fcn] = calling_num @@ -486,44 +540,35 @@ class TestNmcli(NmTestBase): def test_001(self): - self.call_nmcli([]) - self.call_nmcli([], lang = 'pl') + self.call_nmcli_l([]) - self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0']) - self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'], lang = 'de') + self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0']) - self.call_nmcli(['c', 's']) + self.call_nmcli_l(['c', 's']) - self.call_nmcli(['bogus', 's']) + self.call_nmcli_l(['bogus', 's']) def test_002(self): self.init_001() - self.call_nmcli(['d']) + self.call_nmcli_l(['d']) - self.call_nmcli(['-f', 'all', 'd']) + self.call_nmcli_l(['-f', 'all', 'd']) - self.call_nmcli([]) + self.call_nmcli_l([]) - self.call_nmcli(['-f', 'AP', '-mode', 'multiline', 'd', 'show', 'wlan0']) - self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0']) - self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-t', 'd', 'show', 'wlan0']) - self.call_nmcli(['-f', 'AP', '-mode', 'tabular', 'd', 'show', 'wlan0']) - self.call_nmcli(['-f', 'AP', '-mode', 'tabular', '-p', 'd', 'show', 'wlan0']) - self.call_nmcli(['-f', 'AP', '-mode', 'tabular', '-t', 'd', 'show', 'wlan0']) + self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', 'd', 'show', 'wlan0']) + self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0']) + self.call_nmcli_l(['-f', 'AP', '-mode', 'multiline', '-t', 'd', 'show', 'wlan0']) + self.call_nmcli_l(['-f', 'AP', '-mode', 'tabular', 'd', 'show', 'wlan0']) + self.call_nmcli_l(['-f', 'AP', '-mode', 'tabular', '-p', 'd', 'show', 'wlan0']) + self.call_nmcli_l(['-f', 'AP', '-mode', 'tabular', '-t', 'd', 'show', 'wlan0']) - self.call_nmcli(['-f', 'AP', '-mode', 'multiline', 'd', 'show', 'wlan0'], lang = 'pl') - self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-p', 'd', 'show', 'wlan0'], lang = 'pl') - self.call_nmcli(['-f', 'AP', '-mode', 'multiline', '-t', 'd', 'show', 'wlan0'], lang = 'pl') - self.call_nmcli(['-f', 'AP', '-mode', 'tabular', 'd', 'show', 'wlan0'], lang = 'pl') - self.call_nmcli(['-f', 'AP', '-mode', 'tabular', '-p', 'd', 'show', 'wlan0'], lang = 'pl') - self.call_nmcli(['-f', 'AP', '-mode', 'tabular', '-t', 'd', 'show', 'wlan0'], lang = 'pl') + self.call_nmcli_l(['-f', 'ALL', 'd', 'wifi']) - self.call_nmcli(['-f', 'ALL', 'd', 'wifi']) + self.call_nmcli_l(['c']) - self.call_nmcli(['c']) - - self.call_nmcli(['c', 's', 'con-1']) + self.call_nmcli_l(['c', 's', 'con-1']) def test_003(self): self.init_001() @@ -535,27 +580,23 @@ class TestNmcli(NmTestBase): self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*', 'con-name', 'con-xx1'], replace_stdout = replace_stdout) - self.call_nmcli(['c', 's'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['c', 's'], + replace_stdout = replace_stdout) replace_stdout.append((lambda: self.srv.findConnectionUuid('ethernet'), 'UUID-ethernet-REPLACED-REPLACED-REPL')) self.call_nmcli(['c', 'add', 'type', 'ethernet', 'ifname', '*'], replace_stdout = replace_stdout) - self.call_nmcli(['c', 's'], - replace_stdout = replace_stdout) - self.call_nmcli(['c', 's'], lang = 'pl', - replace_stdout = replace_stdout) + self.call_nmcli_l(['c', 's'], + replace_stdout = replace_stdout) - self.call_nmcli(['-f', 'ALL', 'c', 's'], - replace_stdout = replace_stdout) - self.call_nmcli(['-f', 'ALL', 'c', 's'], lang = 'pl', - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', 'c', 's'], + replace_stdout = replace_stdout) - self.call_nmcli(['--complete-args', '-f', 'ALL', 'c', 's', ''], lang = 'pl', - replace_stdout = replace_stdout, - sort_lines_stdout = True) + self.call_nmcli_l(['--complete-args', '-f', 'ALL', 'c', 's', ''], + replace_stdout = replace_stdout, + sort_lines_stdout = True) ############################################################################### |