From ea1830a4294f58a1501a92c2f16b64b8a2b8f04f Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 14:21:00 +0200 Subject: [PATCH 1/8] clients/tests: add extra_env argument to call_nmcli() This is purely for (manual) printf debugging. Hence, it is unused in the commited code. The point is, to add printf statements to nmcli or libnm, like if (getenv ("MY_HACK1")) { ... and trigger it from test-client.py via self.call_nmcli(..., extra_env = { 'MY_HACK1': '1' } ) --- .../test-client.check-on-disk/test_001-001.expected | 2 +- .../test-client.check-on-disk/test_001-002.expected | 2 +- .../test-client.check-on-disk/test_001-003.expected | 2 +- .../test-client.check-on-disk/test_001-004.expected | 2 +- .../test-client.check-on-disk/test_001-005.expected | 2 +- .../test-client.check-on-disk/test_001-006.expected | 2 +- .../test-client.check-on-disk/test_001-007.expected | 2 +- .../test-client.check-on-disk/test_001-008.expected | 2 +- .../test-client.check-on-disk/test_001-009.expected | 2 +- .../test-client.check-on-disk/test_001-010.expected | 2 +- .../test-client.check-on-disk/test_001-011.expected | 2 +- .../test-client.check-on-disk/test_001-012.expected | 2 +- .../test-client.check-on-disk/test_002-001.expected | 2 +- .../test-client.check-on-disk/test_002-002.expected | 2 +- .../test-client.check-on-disk/test_002-003.expected | 2 +- .../test-client.check-on-disk/test_002-004.expected | 2 +- .../test-client.check-on-disk/test_002-005.expected | 2 +- .../test-client.check-on-disk/test_002-006.expected | 2 +- .../test-client.check-on-disk/test_002-007.expected | 2 +- .../test-client.check-on-disk/test_002-008.expected | 2 +- .../test-client.check-on-disk/test_002-009.expected | 2 +- .../test-client.check-on-disk/test_002-010.expected | 2 +- .../test-client.check-on-disk/test_002-011.expected | 2 +- .../test-client.check-on-disk/test_002-012.expected | 2 +- .../test-client.check-on-disk/test_002-013.expected | 2 +- .../test-client.check-on-disk/test_002-014.expected | 2 +- .../test-client.check-on-disk/test_002-015.expected | 2 +- .../test-client.check-on-disk/test_002-016.expected | 2 +- .../test-client.check-on-disk/test_002-017.expected | 2 +- .../test-client.check-on-disk/test_002-018.expected | 2 +- .../test-client.check-on-disk/test_002-019.expected | 2 +- .../test-client.check-on-disk/test_002-020.expected | 2 +- .../test-client.check-on-disk/test_002-021.expected | 2 +- .../test-client.check-on-disk/test_002-022.expected | 2 +- .../test-client.check-on-disk/test_002-023.expected | 2 +- .../test-client.check-on-disk/test_002-024.expected | 2 +- .../test-client.check-on-disk/test_002-025.expected | 2 +- .../test-client.check-on-disk/test_002-026.expected | 2 +- .../test-client.check-on-disk/test_002-027.expected | 2 +- .../test-client.check-on-disk/test_002-028.expected | 2 +- .../test-client.check-on-disk/test_002-029.expected | 2 +- .../test-client.check-on-disk/test_002-030.expected | 2 +- .../test-client.check-on-disk/test_002-031.expected | 2 +- .../test-client.check-on-disk/test_002-032.expected | 2 +- .../test-client.check-on-disk/test_002-033.expected | 2 +- .../test-client.check-on-disk/test_002-034.expected | 2 +- .../test-client.check-on-disk/test_002-035.expected | 2 +- .../test-client.check-on-disk/test_002-036.expected | 2 +- .../test-client.check-on-disk/test_003-001.expected | 2 +- .../test-client.check-on-disk/test_003-002.expected | 2 +- .../test-client.check-on-disk/test_003-003.expected | 2 +- .../test-client.check-on-disk/test_003-004.expected | 2 +- .../test-client.check-on-disk/test_003-005.expected | 2 +- .../test-client.check-on-disk/test_003-006.expected | 2 +- .../test-client.check-on-disk/test_003-007.expected | 2 +- .../test-client.check-on-disk/test_003-008.expected | 2 +- .../test-client.check-on-disk/test_003-009.expected | 2 +- .../test-client.check-on-disk/test_003-010.expected | 2 +- .../test-client.check-on-disk/test_003-011.expected | 2 +- .../test-client.check-on-disk/test_003-012.expected | 2 +- .../test-client.check-on-disk/test_003-013.expected | 2 +- .../test-client.check-on-disk/test_003-014.expected | 2 +- .../test-client.check-on-disk/test_003-015.expected | 2 +- .../test-client.check-on-disk/test_003-016.expected | 2 +- .../test-client.check-on-disk/test_003-017.expected | 2 +- .../test-client.check-on-disk/test_003-018.expected | 2 +- .../test-client.check-on-disk/test_003-019.expected | 2 +- .../test-client.check-on-disk/test_003-020.expected | 2 +- .../test-client.check-on-disk/test_003-021.expected | 2 +- .../test-client.check-on-disk/test_003-022.expected | 2 +- .../test-client.check-on-disk/test_003-023.expected | 2 +- .../test-client.check-on-disk/test_003-024.expected | 2 +- .../test-client.check-on-disk/test_003-025.expected | 2 +- .../test-client.check-on-disk/test_003-026.expected | 2 +- .../test-client.check-on-disk/test_003-027.expected | 2 +- .../test-client.check-on-disk/test_003-028.expected | 2 +- .../test-client.check-on-disk/test_003-029.expected | 2 +- .../test-client.check-on-disk/test_003-030.expected | 2 +- clients/tests/test-client.py | 12 ++++++++++-- 79 files changed, 88 insertions(+), 80 deletions(-) diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected index a6490d2e6a..de7a91f9c4 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:543:test_001()/1 +location: clients/tests/test-client.py:551: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 03107ea54e..4d9777dab4 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:543:test_001()/2 +location: clients/tests/test-client.py:551: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 5bbd500b4e..4441a76a23 100644 --- a/clients/tests/test-client.check-on-disk/test_001-003.expected +++ b/clients/tests/test-client.check-on-disk/test_001-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:543:test_001()/3 +location: clients/tests/test-client.py:551:test_001()/3 cmd: $NMCLI lang: de_DE.utf8 returncode: 0 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 83f32d5a8f..3d85f85b90 100644 --- a/clients/tests/test-client.check-on-disk/test_001-004.expected +++ b/clients/tests/test-client.check-on-disk/test_001-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:545:test_001()/4 +location: clients/tests/test-client.py:553:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected index b27c224d16..e2ac08b8f8 100644 --- a/clients/tests/test-client.check-on-disk/test_001-005.expected +++ b/clients/tests/test-client.check-on-disk/test_001-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:545:test_001()/5 +location: clients/tests/test-client.py:553:test_001()/5 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected index 724e80e1f5..87ba49657b 100644 --- a/clients/tests/test-client.check-on-disk/test_001-006.expected +++ b/clients/tests/test-client.check-on-disk/test_001-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:545:test_001()/6 +location: clients/tests/test-client.py:553:test_001()/6 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: de_DE.utf8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected index 56dc92a366..04000e2cab 100644 --- a/clients/tests/test-client.check-on-disk/test_001-007.expected +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:547:test_001()/7 +location: clients/tests/test-client.py:555:test_001()/7 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected index e2da59bd10..066749eae1 100644 --- a/clients/tests/test-client.check-on-disk/test_001-008.expected +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:547:test_001()/8 +location: clients/tests/test-client.py:555:test_001()/8 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected index 967df95b2a..6ca690cf97 100644 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ b/clients/tests/test-client.check-on-disk/test_001-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:547:test_001()/9 +location: clients/tests/test-client.py:555:test_001()/9 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected index 876f8c52c3..b1ee9b05b5 100644 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ b/clients/tests/test-client.check-on-disk/test_001-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:549:test_001()/10 +location: clients/tests/test-client.py:557:test_001()/10 cmd: $NMCLI bogus s lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected index 95101af11d..f1a4d7226e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:549:test_001()/11 +location: clients/tests/test-client.py:557:test_001()/11 cmd: $NMCLI bogus s lang: pl_PL.UTF-8 returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected index f2acfca91d..632fb95f09 100644 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:549:test_001()/12 +location: clients/tests/test-client.py:557:test_001()/12 cmd: $NMCLI bogus s lang: de_DE.utf8 returncode: 2 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 c1f8737afa..33254a8229 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:554:test_002()/1 +location: clients/tests/test-client.py:562: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 a05f585c72..24fe64bb48 100644 --- a/clients/tests/test-client.check-on-disk/test_002-002.expected +++ b/clients/tests/test-client.check-on-disk/test_002-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:554:test_002()/2 +location: clients/tests/test-client.py:562:test_002()/2 cmd: $NMCLI d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected index bea81cdb74..4e79f0451f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-003.expected +++ b/clients/tests/test-client.check-on-disk/test_002-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:554:test_002()/3 +location: clients/tests/test-client.py:562:test_002()/3 cmd: $NMCLI d lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected index 381bff9996..ae3d055875 100644 --- a/clients/tests/test-client.check-on-disk/test_002-004.expected +++ b/clients/tests/test-client.check-on-disk/test_002-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:556:test_002()/4 +location: clients/tests/test-client.py:564:test_002()/4 cmd: $NMCLI -f all d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected index 9bc51b99b4..6fdc247c1e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-005.expected +++ b/clients/tests/test-client.check-on-disk/test_002-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:556:test_002()/5 +location: clients/tests/test-client.py:564:test_002()/5 cmd: $NMCLI -f all d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected index f97b23a2a3..b25a8bdaf9 100644 --- a/clients/tests/test-client.check-on-disk/test_002-006.expected +++ b/clients/tests/test-client.check-on-disk/test_002-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:556:test_002()/6 +location: clients/tests/test-client.py:564:test_002()/6 cmd: $NMCLI -f all d lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected index 5b0e5d81e2..3b247beeaf 100644 --- a/clients/tests/test-client.check-on-disk/test_002-007.expected +++ b/clients/tests/test-client.check-on-disk/test_002-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:558:test_002()/7 +location: clients/tests/test-client.py:566:test_002()/7 cmd: $NMCLI lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected index 8c8e0d8266..bdc20f79db 100644 --- a/clients/tests/test-client.check-on-disk/test_002-008.expected +++ b/clients/tests/test-client.check-on-disk/test_002-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:558:test_002()/8 +location: clients/tests/test-client.py:566:test_002()/8 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected index c505b76b59..86293c56a7 100644 --- a/clients/tests/test-client.check-on-disk/test_002-009.expected +++ b/clients/tests/test-client.check-on-disk/test_002-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:558:test_002()/9 +location: clients/tests/test-client.py:566:test_002()/9 cmd: $NMCLI lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected index 8167d6bc1f..3dc85181b4 100644 --- a/clients/tests/test-client.check-on-disk/test_002-010.expected +++ b/clients/tests/test-client.check-on-disk/test_002-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:560:test_002()/10 +location: clients/tests/test-client.py:568:test_002()/10 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected index 6e705a9097..fc81d08b54 100644 --- a/clients/tests/test-client.check-on-disk/test_002-011.expected +++ b/clients/tests/test-client.check-on-disk/test_002-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:560:test_002()/11 +location: clients/tests/test-client.py:568:test_002()/11 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected index 836310387d..be54bbce16 100644 --- a/clients/tests/test-client.check-on-disk/test_002-012.expected +++ b/clients/tests/test-client.check-on-disk/test_002-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:560:test_002()/12 +location: clients/tests/test-client.py:568:test_002()/12 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected index dc134b9929..c0f20ea803 100644 --- a/clients/tests/test-client.check-on-disk/test_002-013.expected +++ b/clients/tests/test-client.check-on-disk/test_002-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:561:test_002()/13 +location: clients/tests/test-client.py:569:test_002()/13 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected index 2ce1dd5b5e..76c8efb04e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-014.expected +++ b/clients/tests/test-client.check-on-disk/test_002-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:561:test_002()/14 +location: clients/tests/test-client.py:569:test_002()/14 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected index 31774e7711..e4a53803ab 100644 --- a/clients/tests/test-client.check-on-disk/test_002-015.expected +++ b/clients/tests/test-client.check-on-disk/test_002-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:561:test_002()/15 +location: clients/tests/test-client.py:569:test_002()/15 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected index 74e46abfaf..fc418570ca 100644 --- a/clients/tests/test-client.check-on-disk/test_002-016.expected +++ b/clients/tests/test-client.check-on-disk/test_002-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:562:test_002()/16 +location: clients/tests/test-client.py:570:test_002()/16 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected index abe9fab09f..e5208b30f0 100644 --- a/clients/tests/test-client.check-on-disk/test_002-017.expected +++ b/clients/tests/test-client.check-on-disk/test_002-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:562:test_002()/17 +location: clients/tests/test-client.py:570:test_002()/17 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected index 15972d961d..387799f330 100644 --- a/clients/tests/test-client.check-on-disk/test_002-018.expected +++ b/clients/tests/test-client.check-on-disk/test_002-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:562:test_002()/18 +location: clients/tests/test-client.py:570:test_002()/18 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected index 4a495e21fe..7bb2b684b0 100644 --- a/clients/tests/test-client.check-on-disk/test_002-019.expected +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:563:test_002()/19 +location: clients/tests/test-client.py:571:test_002()/19 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected index 4a9a528dc7..ca1231f67c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-020.expected +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:563:test_002()/20 +location: clients/tests/test-client.py:571:test_002()/20 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected index 6a9ce747e4..fe873a71b7 100644 --- a/clients/tests/test-client.check-on-disk/test_002-021.expected +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:563:test_002()/21 +location: clients/tests/test-client.py:571:test_002()/21 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected index 244225addb..7bcead5526 100644 --- a/clients/tests/test-client.check-on-disk/test_002-022.expected +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:564:test_002()/22 +location: clients/tests/test-client.py:572:test_002()/22 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected index 8d04359192..446f047d1a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-023.expected +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:564:test_002()/23 +location: clients/tests/test-client.py:572:test_002()/23 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected index 63648ea829..1246321135 100644 --- a/clients/tests/test-client.check-on-disk/test_002-024.expected +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:564:test_002()/24 +location: clients/tests/test-client.py:572:test_002()/24 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: de_DE.utf8 returncode: 0 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 index 34bc44eed2..ce22055933 100644 --- a/clients/tests/test-client.check-on-disk/test_002-025.expected +++ b/clients/tests/test-client.check-on-disk/test_002-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:565:test_002()/25 +location: clients/tests/test-client.py:573:test_002()/25 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-026.expected b/clients/tests/test-client.check-on-disk/test_002-026.expected index 21b3ae9993..e0ebfa2a2f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-026.expected +++ b/clients/tests/test-client.check-on-disk/test_002-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:565:test_002()/26 +location: clients/tests/test-client.py:573:test_002()/26 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-027.expected b/clients/tests/test-client.check-on-disk/test_002-027.expected index 19f7899f29..73d1abe5c4 100644 --- a/clients/tests/test-client.check-on-disk/test_002-027.expected +++ b/clients/tests/test-client.check-on-disk/test_002-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:565:test_002()/27 +location: clients/tests/test-client.py:573:test_002()/27 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: de_DE.utf8 returncode: 0 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 index 9ec2112173..ef09954f65 100644 --- a/clients/tests/test-client.check-on-disk/test_002-028.expected +++ b/clients/tests/test-client.check-on-disk/test_002-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:567:test_002()/28 +location: clients/tests/test-client.py:575:test_002()/28 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 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 index a3f09fce81..9328329dfc 100644 --- a/clients/tests/test-client.check-on-disk/test_002-029.expected +++ b/clients/tests/test-client.check-on-disk/test_002-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:567:test_002()/29 +location: clients/tests/test-client.py:575:test_002()/29 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-030.expected b/clients/tests/test-client.check-on-disk/test_002-030.expected index 41e1435c84..394f93a62e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-030.expected +++ b/clients/tests/test-client.check-on-disk/test_002-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:567:test_002()/30 +location: clients/tests/test-client.py:575:test_002()/30 cmd: $NMCLI -f ALL d wifi lang: de_DE.utf8 returncode: 0 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 index 2dd4201c8e..62edfe0aec 100644 --- a/clients/tests/test-client.check-on-disk/test_002-031.expected +++ b/clients/tests/test-client.check-on-disk/test_002-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:569:test_002()/31 +location: clients/tests/test-client.py:577:test_002()/31 cmd: $NMCLI c lang: C returncode: 0 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 index d6dfedab7e..b5c471ed88 100644 --- a/clients/tests/test-client.check-on-disk/test_002-032.expected +++ b/clients/tests/test-client.check-on-disk/test_002-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:569:test_002()/32 +location: clients/tests/test-client.py:577:test_002()/32 cmd: $NMCLI c lang: pl_PL.UTF-8 returncode: 0 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 index 9a9c109cda..f2037f13a2 100644 --- a/clients/tests/test-client.check-on-disk/test_002-033.expected +++ b/clients/tests/test-client.check-on-disk/test_002-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:569:test_002()/33 +location: clients/tests/test-client.py:577:test_002()/33 cmd: $NMCLI c lang: de_DE.utf8 returncode: 0 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 index 59fc086675..60a9f505e0 100644 --- a/clients/tests/test-client.check-on-disk/test_002-034.expected +++ b/clients/tests/test-client.check-on-disk/test_002-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:571:test_002()/34 +location: clients/tests/test-client.py:579:test_002()/34 cmd: $NMCLI c s con-1 lang: C returncode: 0 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 index ec3bad7634..5f61c2b024 100644 --- a/clients/tests/test-client.check-on-disk/test_002-035.expected +++ b/clients/tests/test-client.check-on-disk/test_002-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:571:test_002()/35 +location: clients/tests/test-client.py:579:test_002()/35 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 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 index 244facd05b..b1250b8d67 100644 --- a/clients/tests/test-client.check-on-disk/test_002-036.expected +++ b/clients/tests/test-client.check-on-disk/test_002-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:571:test_002()/36 +location: clients/tests/test-client.py:579:test_002()/36 cmd: $NMCLI c s con-1 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected index a4e739c764..5efbf2517a 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:581:test_003()/1 +location: clients/tests/test-client.py:589: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 21c1a23205..8e0cd40962 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:584:test_003()/2 +location: clients/tests/test-client.py:592: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 86acb7c455..aae4cf2b49 100644 --- a/clients/tests/test-client.check-on-disk/test_003-003.expected +++ b/clients/tests/test-client.check-on-disk/test_003-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:584:test_003()/3 +location: clients/tests/test-client.py:592:test_003()/3 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected index 576708df2e..5c617dd598 100644 --- a/clients/tests/test-client.check-on-disk/test_003-004.expected +++ b/clients/tests/test-client.check-on-disk/test_003-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:584:test_003()/4 +location: clients/tests/test-client.py:592:test_003()/4 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected index ca71469c7f..71d6f87c69 100644 --- a/clients/tests/test-client.check-on-disk/test_003-005.expected +++ b/clients/tests/test-client.check-on-disk/test_003-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:589:test_003()/5 +location: clients/tests/test-client.py:597:test_003()/5 cmd: $NMCLI c add type ethernet ifname '*' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected index 80df78cb6e..032a6cc241 100644 --- a/clients/tests/test-client.check-on-disk/test_003-006.expected +++ b/clients/tests/test-client.check-on-disk/test_003-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:592:test_003()/6 +location: clients/tests/test-client.py:600:test_003()/6 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected index e27a081f0a..dbb0bf71ac 100644 --- a/clients/tests/test-client.check-on-disk/test_003-007.expected +++ b/clients/tests/test-client.check-on-disk/test_003-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:592:test_003()/7 +location: clients/tests/test-client.py:600:test_003()/7 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected index 5892986b52..db5334f4f3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-008.expected +++ b/clients/tests/test-client.check-on-disk/test_003-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:592:test_003()/8 +location: clients/tests/test-client.py:600:test_003()/8 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected index 85a102a392..2de7ec9985 100644 --- a/clients/tests/test-client.check-on-disk/test_003-009.expected +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:595:test_003()/9 +location: clients/tests/test-client.py:603:test_003()/9 cmd: $NMCLI -f ALL c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected index 4d1b93e718..6ee6813836 100644 --- a/clients/tests/test-client.check-on-disk/test_003-010.expected +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:595:test_003()/10 +location: clients/tests/test-client.py:603:test_003()/10 cmd: $NMCLI -f ALL c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected index 9611a18263..eed95bc43d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-011.expected +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:595:test_003()/11 +location: clients/tests/test-client.py:603:test_003()/11 cmd: $NMCLI -f ALL c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected index 1a56267735..4f8ddccc00 100644 --- a/clients/tests/test-client.check-on-disk/test_003-012.expected +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:599:test_003()/12 +location: clients/tests/test-client.py:607:test_003()/12 cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected index 3fa8126ea1..1b057b9ea0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-013.expected +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:599:test_003()/13 +location: clients/tests/test-client.py:607:test_003()/13 cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected index 247e785f53..bcbe7938c7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-014.expected +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:599:test_003()/14 +location: clients/tests/test-client.py:607:test_003()/14 cmd: $NMCLI --complete-args -f ALL c s '' lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected index 5937f5241d..ff2c06a335 100644 --- a/clients/tests/test-client.check-on-disk/test_003-015.expected +++ b/clients/tests/test-client.check-on-disk/test_003-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:601:test_003()/15 +location: clients/tests/test-client.py:609:test_003()/15 cmd: $NMCLI con up ethernet ifname eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected index 57bbcd7247..f205aa3b06 100644 --- a/clients/tests/test-client.check-on-disk/test_003-016.expected +++ b/clients/tests/test-client.check-on-disk/test_003-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:604:test_003()/16 +location: clients/tests/test-client.py:612:test_003()/16 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected index 11aad7c5b9..8c483c89a1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-017.expected +++ b/clients/tests/test-client.check-on-disk/test_003-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:604:test_003()/17 +location: clients/tests/test-client.py:612:test_003()/17 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected index 7c5070b5b4..4ec00bcbcd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-018.expected +++ b/clients/tests/test-client.check-on-disk/test_003-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:604:test_003()/18 +location: clients/tests/test-client.py:612:test_003()/18 cmd: $NMCLI con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected index d95f3ea073..bf5ae802a6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-019.expected +++ b/clients/tests/test-client.check-on-disk/test_003-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:607:test_003()/19 +location: clients/tests/test-client.py:615:test_003()/19 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected index be0e3109d1..11f67945f4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-020.expected +++ b/clients/tests/test-client.check-on-disk/test_003-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:607:test_003()/20 +location: clients/tests/test-client.py:615:test_003()/20 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected index a5fe70a1e6..3e42b825f5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-021.expected +++ b/clients/tests/test-client.check-on-disk/test_003-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:607:test_003()/21 +location: clients/tests/test-client.py:615:test_003()/21 cmd: $NMCLI -f ALL con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected index b74865ed3f..08f18cdd47 100644 --- a/clients/tests/test-client.check-on-disk/test_003-022.expected +++ b/clients/tests/test-client.check-on-disk/test_003-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:610:test_003()/22 +location: clients/tests/test-client.py:618:test_003()/22 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected index a2e91df1c1..f01d8f5e50 100644 --- a/clients/tests/test-client.check-on-disk/test_003-023.expected +++ b/clients/tests/test-client.check-on-disk/test_003-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:610:test_003()/23 +location: clients/tests/test-client.py:618:test_003()/23 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected index 0ae321ebad..19277801ad 100644 --- a/clients/tests/test-client.check-on-disk/test_003-024.expected +++ b/clients/tests/test-client.check-on-disk/test_003-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:610:test_003()/24 +location: clients/tests/test-client.py:618:test_003()/24 cmd: $NMCLI -f ALL con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected index 1cc8f5a609..0612632f6a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:613:test_003()/25 +location: clients/tests/test-client.py:621:test_003()/25 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected index 92161b21af..d2d33cd027 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:613:test_003()/26 +location: clients/tests/test-client.py:621:test_003()/26 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected index 45ecba75cf..4f2866eebb 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:613:test_003()/27 +location: clients/tests/test-client.py:621:test_003()/27 cmd: $NMCLI -f ALL dev s eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected index b3563bbe4b..687b24de13 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:616:test_003()/28 +location: clients/tests/test-client.py:624:test_003()/28 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected index ae4af0107e..26f566f00b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:616:test_003()/29 +location: clients/tests/test-client.py:624:test_003()/29 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index 9a4106a3a3..1f78891ae4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:616:test_003()/30 +location: clients/tests/test-client.py:624:test_003()/30 cmd: $NMCLI -f ALL dev show eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 84863d7526..20d9dc1971 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -287,7 +287,8 @@ class TestNmcli(NmTestBase): expected_stderr = _DEFAULT_ARG, replace_stdout = None, replace_stderr = None, - sort_lines_stdout = False): + sort_lines_stdout = False, + extra_env = None): frame = sys._getframe(1) for lang in [ 'C', 'pl', 'de' ]: self._call_nmcli(args, @@ -299,6 +300,7 @@ class TestNmcli(NmTestBase): replace_stdout, replace_stderr, sort_lines_stdout, + extra_env, frame) @@ -312,7 +314,8 @@ class TestNmcli(NmTestBase): expected_stderr = _DEFAULT_ARG, replace_stdout = None, replace_stderr = None, - sort_lines_stdout = False): + sort_lines_stdout = False, + extra_env = None): frame = sys._getframe(1) @@ -333,6 +336,7 @@ class TestNmcli(NmTestBase): replace_stdout, replace_stderr, sort_lines_stdout, + extra_env, frame) def _call_nmcli(self, @@ -345,6 +349,7 @@ class TestNmcli(NmTestBase): replace_stdout, replace_stderr, sort_lines_stdout, + extra_env, frame): calling_fcn = frame.f_code.co_name @@ -364,6 +369,9 @@ class TestNmcli(NmTestBase): self.fail('invalid language %s' % (lang)) env = {} + if extra_env is not None: + for k, v in extra_env.items(): + env[k] = v for k in ['LD_LIBRARY_PATH', 'DBUS_SESSION_BUS_ADDRESS']: val = os.environ.get(k, None) From d5e25a4324e4e8a57b0411d8daecdd3c13df9cfb Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 14:56:46 +0200 Subject: [PATCH 2/8] clients/tests: print active fields during `nmcli con show` --- Makefile.am | 3 + .../test_003-025.expected | 102 ++++++++++++++++-- .../test_003-026.expected | 102 ++++++++++++++++-- .../test_003-027.expected | 102 ++++++++++++++++-- .../test_003-028.expected | 42 ++------ .../test_003-029.expected | 42 ++------ .../test_003-030.expected | 42 ++------ .../test_003-031.expected | 42 ++++++++ .../test_003-032.expected | 42 ++++++++ .../test_003-033.expected | 42 ++++++++ clients/tests/test-client.py | 3 + 11 files changed, 438 insertions(+), 126 deletions(-) create mode 100644 clients/tests/test-client.check-on-disk/test_003-031.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-032.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-033.expected diff --git a/Makefile.am b/Makefile.am index b4bd5437e0..84507e2412 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3885,6 +3885,9 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_003-028.expected \ clients/tests/test-client.check-on-disk/test_003-029.expected \ clients/tests/test-client.check-on-disk/test_003-030.expected \ + clients/tests/test-client.check-on-disk/test_003-031.expected \ + clients/tests/test-client.check-on-disk/test_003-032.expected \ + clients/tests/test-client.check-on-disk/test_003-033.expected \ \ $(NULL) diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected index 0612632f6a..a1030453f8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,18 +1,102 @@ location: clients/tests/test-client.py:621:test_003()/25 -cmd: $NMCLI -f ALL dev s eth0 +cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 880 bytes +stdout: 4180 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected index d2d33cd027..9779fdc298 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,18 +1,102 @@ location: clients/tests/test-client.py:621:test_003()/26 -cmd: $NMCLI -f ALL dev s eth0 +cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 884 bytes +stdout: 4201 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -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 -- -- -- -eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected index 4f2866eebb..f64f03c82b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,18 +1,102 @@ location: clients/tests/test-client.py:621:test_003()/27 -cmd: $NMCLI -f ALL dev s eth0 +cmd: $NMCLI con s ethernet lang: de_DE.utf8 returncode: 0 -stdout: 904 bytes +stdout: 4201 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -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 -- -- -- -eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +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) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nein +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nein +ipv4.ignore-auto-dns: nein +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: ja +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nein +ipv4.may-fail: ja +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nein +ipv6.ignore-auto-dns: nein +ipv6.never-default: nein +ipv6.may-fail: ja +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: ja +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nein +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: nein +GENERAL.DEFAULT6: nein +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nein +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< -stderr: 28 bytes +stderr: 0 bytes >>> -Unbekannter Parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected index 687b24de13..a5891280f0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,42 +1,18 @@ location: clients/tests/test-client.py:624:test_003()/28 -cmd: $NMCLI -f ALL dev show eth0 +cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 -stdout: 1487 bytes +stdout: 880 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (unavailable) -GENERAL.REASON: 0 (No reason given) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: no -GENERAL.NM-MANAGED: yes -GENERAL.AUTOCONNECT: yes -GENERAL.FIRMWARE-MISSING: no -GENERAL.NM-PLUGIN-MISSING: no -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unknown -CAPABILITIES.CARRIER-DETECT: no -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: no -CAPABILITIES.SRIOV: no -WIRED-PROPERTIES.CARRIER: off -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected index 26f566f00b..ce983d5e9a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,42 +1,18 @@ location: clients/tests/test-client.py:624:test_003()/29 -cmd: $NMCLI -f ALL dev show eth0 +cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1510 bytes +stdout: 884 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (niedostępne) -GENERAL.REASON: 0 (Nie podano przyczyny) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nie -GENERAL.NM-MANAGED: tak -GENERAL.AUTOCONNECT: tak -GENERAL.FIRMWARE-MISSING: nie -GENERAL.NM-PLUGIN-MISSING: nie -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: nieznane -CAPABILITIES.CARRIER-DETECT: nie -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nie -CAPABILITIES.SRIOV: nie -WIRED-PROPERTIES.CARRIER: wyłączone -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +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 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index 1f78891ae4..47f3507473 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,42 +1,18 @@ location: clients/tests/test-client.py:624:test_003()/30 -cmd: $NMCLI -f ALL dev show eth0 +cmd: $NMCLI -f ALL dev s eth0 lang: de_DE.utf8 returncode: 0 -stdout: 1509 bytes +stdout: 904 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (nicht verfügbar) -GENERAL.REASON: 0 (Kein Grund angegeben) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nein -GENERAL.NM-MANAGED: ja -GENERAL.AUTOCONNECT: ja -GENERAL.FIRMWARE-MISSING: nein -GENERAL.NM-PLUGIN-MISSING: nein -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unbekannt -CAPABILITIES.CARRIER-DETECT: nein -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nein -CAPABILITIES.SRIOV: nein -WIRED-PROPERTIES.CARRIER: aus -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +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 -- -- -- +eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< -stderr: 0 bytes +stderr: 28 bytes >>> +Unbekannter Parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected new file mode 100644 index 0000000000..bd489edeba --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:627:test_003()/31 +cmd: $NMCLI -f ALL dev show eth0 +lang: C +returncode: 0 +stdout: 1487 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIRED-PROPERTIES.CARRIER: off +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected new file mode 100644 index 0000000000..a87c0eb962 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:627:test_003()/32 +cmd: $NMCLI -f ALL dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1510 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected new file mode 100644 index 0000000000..23a5e12131 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:627:test_003()/33 +cmd: $NMCLI -f ALL dev show eth0 +lang: de_DE.utf8 +returncode: 0 +stdout: 1509 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (nicht verfügbar) +GENERAL.REASON: 0 (Kein Grund angegeben) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nein +GENERAL.NM-MANAGED: ja +GENERAL.AUTOCONNECT: ja +GENERAL.FIRMWARE-MISSING: nein +GENERAL.NM-PLUGIN-MISSING: nein +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unbekannt +CAPABILITIES.CARRIER-DETECT: nein +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nein +CAPABILITIES.SRIOV: nein +WIRED-PROPERTIES.CARRIER: aus +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 20d9dc1971..47a588b77d 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -617,6 +617,9 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'], replace_stdout = replace_stdout) + self.call_nmcli_l(['con', 's', 'ethernet'], + replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', 'dev', 's', 'eth0'], replace_stdout = replace_stdout) From 7ae5fb7ec61f7215b3d609f656403b432ca20028 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 12:06:08 +0200 Subject: [PATCH 3/8] clients/tests: test nmcli output for multiple activation of same profile Activate the same profile on two devices. Arguably, real NetworkManager (currently) does not allow that. But the D-Bus API is fine with having multiple ActiveConnections for one SettingsConnection. So, also the client should do something sensible. Also, later we will add wildcard support to NetworkManager, which means that a profile can be active multiple times (simultaneously). --- Makefile.am | 19 +++ .../test_001-001.expected | 2 +- .../test_001-002.expected | 2 +- .../test_001-003.expected | 2 +- .../test_001-004.expected | 2 +- .../test_001-005.expected | 2 +- .../test_001-006.expected | 2 +- .../test_001-007.expected | 2 +- .../test_001-008.expected | 2 +- .../test_001-009.expected | 2 +- .../test_001-010.expected | 2 +- .../test_001-011.expected | 2 +- .../test_001-012.expected | 2 +- .../test_002-001.expected | 5 +- .../test_002-002.expected | 5 +- .../test_002-003.expected | 5 +- .../test_002-004.expected | 9 +- .../test_002-005.expected | 9 +- .../test_002-006.expected | 9 +- .../test_002-007.expected | 8 +- .../test_002-008.expected | 8 +- .../test_002-009.expected | 8 +- .../test_002-010.expected | 2 +- .../test_002-011.expected | 2 +- .../test_002-012.expected | 2 +- .../test_002-013.expected | 2 +- .../test_002-014.expected | 2 +- .../test_002-015.expected | 2 +- .../test_002-016.expected | 2 +- .../test_002-017.expected | 2 +- .../test_002-018.expected | 2 +- .../test_002-019.expected | 2 +- .../test_002-020.expected | 2 +- .../test_002-021.expected | 2 +- .../test_002-022.expected | 2 +- .../test_002-023.expected | 2 +- .../test_002-024.expected | 2 +- .../test_002-025.expected | 2 +- .../test_002-026.expected | 2 +- .../test_002-027.expected | 2 +- .../test_002-028.expected | 2 +- .../test_002-029.expected | 2 +- .../test_002-030.expected | 2 +- .../test_002-031.expected | 2 +- .../test_002-032.expected | 2 +- .../test_002-033.expected | 2 +- .../test_002-034.expected | 2 +- .../test_002-035.expected | 2 +- .../test_002-036.expected | 2 +- .../test_003-001.expected | 2 +- .../test_003-002.expected | 2 +- .../test_003-003.expected | 2 +- .../test_003-004.expected | 2 +- .../test_003-005.expected | 2 +- .../test_003-006.expected | 2 +- .../test_003-007.expected | 2 +- .../test_003-008.expected | 2 +- .../test_003-009.expected | 2 +- .../test_003-010.expected | 2 +- .../test_003-011.expected | 2 +- .../test_003-012.expected | 2 +- .../test_003-013.expected | 2 +- .../test_003-014.expected | 2 +- .../test_003-015.expected | 2 +- .../test_003-016.expected | 2 +- .../test_003-017.expected | 2 +- .../test_003-018.expected | 2 +- .../test_003-019.expected | 2 +- .../test_003-020.expected | 2 +- .../test_003-021.expected | 2 +- .../test_003-022.expected | 2 +- .../test_003-023.expected | 2 +- .../test_003-024.expected | 2 +- .../test_003-025.expected | 2 +- .../test_003-026.expected | 2 +- .../test_003-027.expected | 2 +- .../test_003-028.expected | 9 +- .../test_003-029.expected | 9 +- .../test_003-030.expected | 9 +- .../test_003-031.expected | 2 +- .../test_003-032.expected | 2 +- .../test_003-033.expected | 2 +- .../test_003-034.expected | 13 ++ .../test_003-035.expected | 16 +++ .../test_003-036.expected | 16 +++ .../test_003-037.expected | 16 +++ .../test_003-038.expected | 16 +++ .../test_003-039.expected | 16 +++ .../test_003-040.expected | 16 +++ .../test_003-041.expected | 90 ++++++++++++++ .../test_003-042.expected | 90 ++++++++++++++ .../test_003-043.expected | 90 ++++++++++++++ .../test_003-044.expected | 115 ++++++++++++++++++ .../test_003-045.expected | 115 ++++++++++++++++++ .../test_003-046.expected | 115 ++++++++++++++++++ .../test_003-047.expected | 19 +++ .../test_003-048.expected | 19 +++ .../test_003-049.expected | 19 +++ .../test_003-050.expected | 42 +++++++ .../test_003-051.expected | 42 +++++++ .../test_003-052.expected | 42 +++++++ clients/tests/test-client.py | 39 ++++-- 102 files changed, 1078 insertions(+), 118 deletions(-) create mode 100644 clients/tests/test-client.check-on-disk/test_003-034.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-035.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-036.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-037.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-038.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-039.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-040.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-041.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-042.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-043.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-044.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-045.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-046.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-047.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-048.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-049.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-050.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-051.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-052.expected diff --git a/Makefile.am b/Makefile.am index 84507e2412..c4430e208f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3888,6 +3888,25 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_003-031.expected \ clients/tests/test-client.check-on-disk/test_003-032.expected \ clients/tests/test-client.check-on-disk/test_003-033.expected \ + clients/tests/test-client.check-on-disk/test_003-034.expected \ + clients/tests/test-client.check-on-disk/test_003-035.expected \ + clients/tests/test-client.check-on-disk/test_003-036.expected \ + clients/tests/test-client.check-on-disk/test_003-037.expected \ + clients/tests/test-client.check-on-disk/test_003-038.expected \ + clients/tests/test-client.check-on-disk/test_003-039.expected \ + clients/tests/test-client.check-on-disk/test_003-040.expected \ + clients/tests/test-client.check-on-disk/test_003-041.expected \ + clients/tests/test-client.check-on-disk/test_003-042.expected \ + clients/tests/test-client.check-on-disk/test_003-043.expected \ + clients/tests/test-client.check-on-disk/test_003-044.expected \ + clients/tests/test-client.check-on-disk/test_003-045.expected \ + clients/tests/test-client.check-on-disk/test_003-046.expected \ + clients/tests/test-client.check-on-disk/test_003-047.expected \ + clients/tests/test-client.check-on-disk/test_003-048.expected \ + clients/tests/test-client.check-on-disk/test_003-049.expected \ + clients/tests/test-client.check-on-disk/test_003-050.expected \ + clients/tests/test-client.check-on-disk/test_003-051.expected \ + clients/tests/test-client.check-on-disk/test_003-052.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 de7a91f9c4..f439652a09 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:551:test_001()/1 +location: clients/tests/test-client.py:553: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 4d9777dab4..74a3e21a4f 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:551:test_001()/2 +location: clients/tests/test-client.py:553: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 4441a76a23..4817859338 100644 --- a/clients/tests/test-client.check-on-disk/test_001-003.expected +++ b/clients/tests/test-client.check-on-disk/test_001-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:551:test_001()/3 +location: clients/tests/test-client.py:553:test_001()/3 cmd: $NMCLI lang: de_DE.utf8 returncode: 0 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 3d85f85b90..a7d604cf21 100644 --- a/clients/tests/test-client.check-on-disk/test_001-004.expected +++ b/clients/tests/test-client.check-on-disk/test_001-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:553:test_001()/4 +location: clients/tests/test-client.py:555:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected index e2ac08b8f8..75f8b95611 100644 --- a/clients/tests/test-client.check-on-disk/test_001-005.expected +++ b/clients/tests/test-client.check-on-disk/test_001-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:553:test_001()/5 +location: clients/tests/test-client.py:555:test_001()/5 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected index 87ba49657b..ac49bb1c83 100644 --- a/clients/tests/test-client.check-on-disk/test_001-006.expected +++ b/clients/tests/test-client.check-on-disk/test_001-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:553:test_001()/6 +location: clients/tests/test-client.py:555:test_001()/6 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: de_DE.utf8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected index 04000e2cab..39bb04c3c8 100644 --- a/clients/tests/test-client.check-on-disk/test_001-007.expected +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:555:test_001()/7 +location: clients/tests/test-client.py:557:test_001()/7 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected index 066749eae1..3ece98808e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-008.expected +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:555:test_001()/8 +location: clients/tests/test-client.py:557:test_001()/8 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected index 6ca690cf97..3973dde1d4 100644 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ b/clients/tests/test-client.check-on-disk/test_001-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:555:test_001()/9 +location: clients/tests/test-client.py:557:test_001()/9 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected index b1ee9b05b5..7b6c32d427 100644 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ b/clients/tests/test-client.check-on-disk/test_001-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:557:test_001()/10 +location: clients/tests/test-client.py:559:test_001()/10 cmd: $NMCLI bogus s lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected index f1a4d7226e..182191a658 100644 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:557:test_001()/11 +location: clients/tests/test-client.py:559:test_001()/11 cmd: $NMCLI bogus s lang: pl_PL.UTF-8 returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected index 632fb95f09..367cc18469 100644 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:557:test_001()/12 +location: clients/tests/test-client.py:559:test_001()/12 cmd: $NMCLI bogus s lang: de_DE.utf8 returncode: 2 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 33254a8229..266fb1dc20 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,11 +1,12 @@ -location: clients/tests/test-client.py:562:test_002()/1 +location: clients/tests/test-client.py:564:test_002()/1 cmd: $NMCLI d lang: C returncode: 0 -stdout: 215 bytes +stdout: 258 bytes >>> DEVICE TYPE STATE CONNECTION eth0 ethernet unavailable -- +eth1 ethernet unavailable -- wlan0 wifi unavailable -- wlan1 wifi unavailable -- wlan1 wifi unavailable -- 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 24fe64bb48..42ab10b8bf 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,11 +1,12 @@ -location: clients/tests/test-client.py:562:test_002()/2 +location: clients/tests/test-client.py:564:test_002()/2 cmd: $NMCLI d lang: pl_PL.UTF-8 returncode: 0 -stdout: 219 bytes +stdout: 263 bytes >>> DEVICE TYPE STATE CONNECTION eth0 ethernet niedostępne -- +eth1 ethernet niedostępne -- wlan0 wifi niedostępne -- wlan1 wifi niedostępne -- wlan1 wifi niedostępne -- 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 4e79f0451f..d2cd4203c1 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,11 +1,12 @@ -location: clients/tests/test-client.py:562:test_002()/3 +location: clients/tests/test-client.py:564:test_002()/3 cmd: $NMCLI d lang: de_DE.utf8 returncode: 0 -stdout: 239 bytes +stdout: 287 bytes >>> DEVICE TYPE STATE CONNECTION eth0 ethernet nicht verfügbar -- +eth1 ethernet nicht verfügbar -- wlan0 wifi nicht verfügbar -- wlan1 wifi nicht verfügbar -- wlan1 wifi nicht verfügbar -- 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 ae3d055875..04141802ff 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,14 +1,15 @@ -location: clients/tests/test-client.py:564:test_002()/4 +location: clients/tests/test-client.py:566:test_002()/4 cmd: $NMCLI -f all d lang: C returncode: 0 -stdout: 530 bytes +stdout: 636 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 -- -- -- +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< 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 6fdc247c1e..73e028b951 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,14 +1,15 @@ -location: clients/tests/test-client.py:564:test_002()/5 +location: clients/tests/test-client.py:566:test_002()/5 cmd: $NMCLI -f all d lang: pl_PL.UTF-8 returncode: 0 -stdout: 534 bytes +stdout: 641 bytes >>> 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 -- -- -- +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< 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 b25a8bdaf9..3ccedade36 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,14 +1,15 @@ -location: clients/tests/test-client.py:564:test_002()/6 +location: clients/tests/test-client.py:566:test_002()/6 cmd: $NMCLI -f all d lang: de_DE.utf8 returncode: 0 -stdout: 554 bytes +stdout: 665 bytes >>> 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 -- -- -- +eth1 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< 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 3b247beeaf..9d33e74773 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,17 @@ -location: clients/tests/test-client.py:566:test_002()/7 +location: clients/tests/test-client.py:568:test_002()/7 cmd: $NMCLI lang: C returncode: 0 -stdout: 551 bytes +stdout: 621 bytes >>> eth0: unavailable "eth0" ethernet (virtual), 72:41:AB:90:41:5D, hw +eth1: unavailable + "eth1" + ethernet (virtual), 1F:E6:D1:E6:1D:53, hw + wlan0: unavailable "wlan0" wifi (virtual), 5A:88:5E:B6:90:40, hw 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 bdc20f79db..1128fb267b 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,13 +1,17 @@ -location: clients/tests/test-client.py:566:test_002()/8 +location: clients/tests/test-client.py:568:test_002()/8 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 -stdout: 608 bytes +stdout: 684 bytes >>> eth0: niedostępne "eth0" ethernet (virtual), 72:41:AB:90:41:5D, sprzęt +eth1: niedostępne + "eth1" + ethernet (virtual), 1F:E6:D1:E6:1D:53, sprzęt + wlan0: niedostępne "wlan0" wifi (virtual), 5A:88:5E:B6:90:40, sprzęt 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 86293c56a7..e3b1321615 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,13 +1,17 @@ -location: clients/tests/test-client.py:566:test_002()/9 +location: clients/tests/test-client.py:568:test_002()/9 cmd: $NMCLI lang: de_DE.utf8 returncode: 0 -stdout: 616 bytes +stdout: 691 bytes >>> eth0: nicht verfügbar "eth0" ethernet (virtual), 72:41:AB:90:41:5D, hw +eth1: nicht verfügbar + "eth1" + ethernet (virtual), 1F:E6:D1:E6:1D:53, hw + wlan0: nicht verfügbar "wlan0" wifi (virtual), 5A:88:5E:B6:90:40, hw 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 3dc85181b4..c2dbfd4bef 100644 --- a/clients/tests/test-client.check-on-disk/test_002-010.expected +++ b/clients/tests/test-client.check-on-disk/test_002-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:568:test_002()/10 +location: clients/tests/test-client.py:570:test_002()/10 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected index fc81d08b54..001d45399b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-011.expected +++ b/clients/tests/test-client.check-on-disk/test_002-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:568:test_002()/11 +location: clients/tests/test-client.py:570:test_002()/11 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected index be54bbce16..8edda84617 100644 --- a/clients/tests/test-client.check-on-disk/test_002-012.expected +++ b/clients/tests/test-client.check-on-disk/test_002-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:568:test_002()/12 +location: clients/tests/test-client.py:570:test_002()/12 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected index c0f20ea803..a2261cf2c2 100644 --- a/clients/tests/test-client.check-on-disk/test_002-013.expected +++ b/clients/tests/test-client.check-on-disk/test_002-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:569:test_002()/13 +location: clients/tests/test-client.py:571:test_002()/13 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected index 76c8efb04e..c7d322fea5 100644 --- a/clients/tests/test-client.check-on-disk/test_002-014.expected +++ b/clients/tests/test-client.check-on-disk/test_002-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:569:test_002()/14 +location: clients/tests/test-client.py:571:test_002()/14 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected index e4a53803ab..3f03f76dc8 100644 --- a/clients/tests/test-client.check-on-disk/test_002-015.expected +++ b/clients/tests/test-client.check-on-disk/test_002-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:569:test_002()/15 +location: clients/tests/test-client.py:571:test_002()/15 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected index fc418570ca..06f74b2ed1 100644 --- a/clients/tests/test-client.check-on-disk/test_002-016.expected +++ b/clients/tests/test-client.check-on-disk/test_002-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:570:test_002()/16 +location: clients/tests/test-client.py:572:test_002()/16 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected index e5208b30f0..c7728ca274 100644 --- a/clients/tests/test-client.check-on-disk/test_002-017.expected +++ b/clients/tests/test-client.check-on-disk/test_002-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:570:test_002()/17 +location: clients/tests/test-client.py:572:test_002()/17 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected index 387799f330..20507aa66f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-018.expected +++ b/clients/tests/test-client.check-on-disk/test_002-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:570:test_002()/18 +location: clients/tests/test-client.py:572:test_002()/18 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected index 7bb2b684b0..01876995a4 100644 --- a/clients/tests/test-client.check-on-disk/test_002-019.expected +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:571:test_002()/19 +location: clients/tests/test-client.py:573:test_002()/19 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected index ca1231f67c..212f99a8ec 100644 --- a/clients/tests/test-client.check-on-disk/test_002-020.expected +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:571:test_002()/20 +location: clients/tests/test-client.py:573:test_002()/20 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected index fe873a71b7..d52ad2de64 100644 --- a/clients/tests/test-client.check-on-disk/test_002-021.expected +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:571:test_002()/21 +location: clients/tests/test-client.py:573:test_002()/21 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected index 7bcead5526..b48011dd32 100644 --- a/clients/tests/test-client.check-on-disk/test_002-022.expected +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:572:test_002()/22 +location: clients/tests/test-client.py:574:test_002()/22 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected index 446f047d1a..5973b9a351 100644 --- a/clients/tests/test-client.check-on-disk/test_002-023.expected +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:572:test_002()/23 +location: clients/tests/test-client.py:574:test_002()/23 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected index 1246321135..67fbb0b82c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-024.expected +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:572:test_002()/24 +location: clients/tests/test-client.py:574:test_002()/24 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: de_DE.utf8 returncode: 0 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 index ce22055933..f0ff60da35 100644 --- a/clients/tests/test-client.check-on-disk/test_002-025.expected +++ b/clients/tests/test-client.check-on-disk/test_002-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:573:test_002()/25 +location: clients/tests/test-client.py:575:test_002()/25 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-026.expected b/clients/tests/test-client.check-on-disk/test_002-026.expected index e0ebfa2a2f..0e28e9737e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-026.expected +++ b/clients/tests/test-client.check-on-disk/test_002-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:573:test_002()/26 +location: clients/tests/test-client.py:575:test_002()/26 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-027.expected b/clients/tests/test-client.check-on-disk/test_002-027.expected index 73d1abe5c4..49d2569f20 100644 --- a/clients/tests/test-client.check-on-disk/test_002-027.expected +++ b/clients/tests/test-client.check-on-disk/test_002-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:573:test_002()/27 +location: clients/tests/test-client.py:575:test_002()/27 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: de_DE.utf8 returncode: 0 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 index ef09954f65..48ed78797a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-028.expected +++ b/clients/tests/test-client.check-on-disk/test_002-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:575:test_002()/28 +location: clients/tests/test-client.py:577:test_002()/28 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 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 index 9328329dfc..8dc2ffd971 100644 --- a/clients/tests/test-client.check-on-disk/test_002-029.expected +++ b/clients/tests/test-client.check-on-disk/test_002-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:575:test_002()/29 +location: clients/tests/test-client.py:577:test_002()/29 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-030.expected b/clients/tests/test-client.check-on-disk/test_002-030.expected index 394f93a62e..c80843650b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-030.expected +++ b/clients/tests/test-client.check-on-disk/test_002-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:575:test_002()/30 +location: clients/tests/test-client.py:577:test_002()/30 cmd: $NMCLI -f ALL d wifi lang: de_DE.utf8 returncode: 0 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 index 62edfe0aec..e98814e6bd 100644 --- a/clients/tests/test-client.check-on-disk/test_002-031.expected +++ b/clients/tests/test-client.check-on-disk/test_002-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_002()/31 +location: clients/tests/test-client.py:579:test_002()/31 cmd: $NMCLI c lang: C returncode: 0 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 index b5c471ed88..a77fedab46 100644 --- a/clients/tests/test-client.check-on-disk/test_002-032.expected +++ b/clients/tests/test-client.check-on-disk/test_002-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_002()/32 +location: clients/tests/test-client.py:579:test_002()/32 cmd: $NMCLI c lang: pl_PL.UTF-8 returncode: 0 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 index f2037f13a2..b616767432 100644 --- a/clients/tests/test-client.check-on-disk/test_002-033.expected +++ b/clients/tests/test-client.check-on-disk/test_002-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_002()/33 +location: clients/tests/test-client.py:579:test_002()/33 cmd: $NMCLI c lang: de_DE.utf8 returncode: 0 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 index 60a9f505e0..bfcf4ceb16 100644 --- a/clients/tests/test-client.check-on-disk/test_002-034.expected +++ b/clients/tests/test-client.check-on-disk/test_002-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_002()/34 +location: clients/tests/test-client.py:581:test_002()/34 cmd: $NMCLI c s con-1 lang: C returncode: 0 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 index 5f61c2b024..bc5b468cfd 100644 --- a/clients/tests/test-client.check-on-disk/test_002-035.expected +++ b/clients/tests/test-client.check-on-disk/test_002-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_002()/35 +location: clients/tests/test-client.py:581:test_002()/35 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 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 index b1250b8d67..1ec82a91f5 100644 --- a/clients/tests/test-client.check-on-disk/test_002-036.expected +++ b/clients/tests/test-client.check-on-disk/test_002-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_002()/36 +location: clients/tests/test-client.py:581:test_002()/36 cmd: $NMCLI c s con-1 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected index 5efbf2517a..b012f820fa 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:589:test_003()/1 +location: clients/tests/test-client.py:591: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 8e0cd40962..4703b77689 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:592:test_003()/2 +location: clients/tests/test-client.py:594: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 aae4cf2b49..a270565183 100644 --- a/clients/tests/test-client.check-on-disk/test_003-003.expected +++ b/clients/tests/test-client.check-on-disk/test_003-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:592:test_003()/3 +location: clients/tests/test-client.py:594:test_003()/3 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected index 5c617dd598..e215769fe9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-004.expected +++ b/clients/tests/test-client.check-on-disk/test_003-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:592:test_003()/4 +location: clients/tests/test-client.py:594:test_003()/4 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected index 71d6f87c69..f37dd9e297 100644 --- a/clients/tests/test-client.check-on-disk/test_003-005.expected +++ b/clients/tests/test-client.check-on-disk/test_003-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:597:test_003()/5 +location: clients/tests/test-client.py:599:test_003()/5 cmd: $NMCLI c add type ethernet ifname '*' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected index 032a6cc241..c077a68469 100644 --- a/clients/tests/test-client.check-on-disk/test_003-006.expected +++ b/clients/tests/test-client.check-on-disk/test_003-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:600:test_003()/6 +location: clients/tests/test-client.py:602:test_003()/6 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected index dbb0bf71ac..9fbb51e649 100644 --- a/clients/tests/test-client.check-on-disk/test_003-007.expected +++ b/clients/tests/test-client.check-on-disk/test_003-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:600:test_003()/7 +location: clients/tests/test-client.py:602:test_003()/7 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected index db5334f4f3..09132397cf 100644 --- a/clients/tests/test-client.check-on-disk/test_003-008.expected +++ b/clients/tests/test-client.check-on-disk/test_003-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:600:test_003()/8 +location: clients/tests/test-client.py:602:test_003()/8 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected index 2de7ec9985..17eeb70b8f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-009.expected +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:603:test_003()/9 +location: clients/tests/test-client.py:605:test_003()/9 cmd: $NMCLI -f ALL c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected index 6ee6813836..d15bc3a95e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-010.expected +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:603:test_003()/10 +location: clients/tests/test-client.py:605:test_003()/10 cmd: $NMCLI -f ALL c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected index eed95bc43d..4f74030f25 100644 --- a/clients/tests/test-client.check-on-disk/test_003-011.expected +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:603:test_003()/11 +location: clients/tests/test-client.py:605:test_003()/11 cmd: $NMCLI -f ALL c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected index 4f8ddccc00..1223b93e49 100644 --- a/clients/tests/test-client.check-on-disk/test_003-012.expected +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:607:test_003()/12 +location: clients/tests/test-client.py:609:test_003()/12 cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected index 1b057b9ea0..72e2b62897 100644 --- a/clients/tests/test-client.check-on-disk/test_003-013.expected +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:607:test_003()/13 +location: clients/tests/test-client.py:609:test_003()/13 cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected index bcbe7938c7..c4ddaecd94 100644 --- a/clients/tests/test-client.check-on-disk/test_003-014.expected +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:607:test_003()/14 +location: clients/tests/test-client.py:609:test_003()/14 cmd: $NMCLI --complete-args -f ALL c s '' lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected index ff2c06a335..ac447c04c9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-015.expected +++ b/clients/tests/test-client.check-on-disk/test_003-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:609:test_003()/15 +location: clients/tests/test-client.py:622:test_003()/15 cmd: $NMCLI con up ethernet ifname eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected index f205aa3b06..047da09801 100644 --- a/clients/tests/test-client.check-on-disk/test_003-016.expected +++ b/clients/tests/test-client.check-on-disk/test_003-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:612:test_003()/16 +location: clients/tests/test-client.py:625:test_003()/16 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected index 8c483c89a1..0cf9978d57 100644 --- a/clients/tests/test-client.check-on-disk/test_003-017.expected +++ b/clients/tests/test-client.check-on-disk/test_003-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:612:test_003()/17 +location: clients/tests/test-client.py:625:test_003()/17 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected index 4ec00bcbcd..c292cd5b10 100644 --- a/clients/tests/test-client.check-on-disk/test_003-018.expected +++ b/clients/tests/test-client.check-on-disk/test_003-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:612:test_003()/18 +location: clients/tests/test-client.py:625:test_003()/18 cmd: $NMCLI con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected index bf5ae802a6..5c71907fd2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-019.expected +++ b/clients/tests/test-client.check-on-disk/test_003-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:615:test_003()/19 +location: clients/tests/test-client.py:628:test_003()/19 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected index 11f67945f4..7d2443a7fe 100644 --- a/clients/tests/test-client.check-on-disk/test_003-020.expected +++ b/clients/tests/test-client.check-on-disk/test_003-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:615:test_003()/20 +location: clients/tests/test-client.py:628:test_003()/20 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected index 3e42b825f5..f89f5c386f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-021.expected +++ b/clients/tests/test-client.check-on-disk/test_003-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:615:test_003()/21 +location: clients/tests/test-client.py:628:test_003()/21 cmd: $NMCLI -f ALL con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected index 08f18cdd47..bcfda75db8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-022.expected +++ b/clients/tests/test-client.check-on-disk/test_003-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:618:test_003()/22 +location: clients/tests/test-client.py:631:test_003()/22 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected index f01d8f5e50..7a1d42faa5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-023.expected +++ b/clients/tests/test-client.check-on-disk/test_003-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:618:test_003()/23 +location: clients/tests/test-client.py:631:test_003()/23 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected index 19277801ad..14d323b669 100644 --- a/clients/tests/test-client.check-on-disk/test_003-024.expected +++ b/clients/tests/test-client.check-on-disk/test_003-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:618:test_003()/24 +location: clients/tests/test-client.py:631:test_003()/24 cmd: $NMCLI -f ALL con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected index a1030453f8..0346ccfde6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:621:test_003()/25 +location: clients/tests/test-client.py:634:test_003()/25 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected index 9779fdc298..0eeee627d3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:621:test_003()/26 +location: clients/tests/test-client.py:634:test_003()/26 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected index f64f03c82b..1038611d78 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:621:test_003()/27 +location: clients/tests/test-client.py:634:test_003()/27 cmd: $NMCLI con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected index a5891280f0..f4a92c53b8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,13 +1,14 @@ -location: clients/tests/test-client.py:624:test_003()/28 +location: clients/tests/test-client.py:637:test_003()/28 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 -stdout: 880 bytes +stdout: 1056 bytes >>> DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected index ce983d5e9a..9ac6479762 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,13 +1,14 @@ -location: clients/tests/test-client.py:624:test_003()/29 +location: clients/tests/test-client.py:637:test_003()/29 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 884 bytes +stdout: 1061 bytes >>> DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index 47f3507473..6d6102114e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,13 +1,14 @@ -location: clients/tests/test-client.py:624:test_003()/30 +location: clients/tests/test-client.py:637:test_003()/30 cmd: $NMCLI -f ALL dev s eth0 lang: de_DE.utf8 returncode: 0 -stdout: 904 bytes +stdout: 1085 bytes >>> DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- +eth1 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/5 -- -- -- eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index bd489edeba..9745dd08d7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:627:test_003()/31 +location: clients/tests/test-client.py:640:test_003()/31 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected index a87c0eb962..0dd7ee606b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-032.expected +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:627:test_003()/32 +location: clients/tests/test-client.py:640:test_003()/32 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected index 23a5e12131..8c8cb10fb1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-033.expected +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:627:test_003()/33 +location: clients/tests/test-client.py:640:test_003()/33 cmd: $NMCLI -f ALL dev show eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected new file mode 100644 index 0000000000..45679c36a7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -0,0 +1,13 @@ +location: clients/tests/test-client.py:622:test_003()/34 +cmd: $NMCLI con up ethernet ifname eth1 +lang: C +returncode: 0 +stdout: 106 bytes +>>> +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2) + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected new file mode 100644 index 0000000000..4efb855eae --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:625:test_003()/35 +cmd: $NMCLI con +lang: C +returncode: 0 +stdout: 264 bytes +>>> +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected new file mode 100644 index 0000000000..309b1682c6 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:625:test_003()/36 +cmd: $NMCLI con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 264 bytes +>>> +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected new file mode 100644 index 0000000000..052a6f49fe --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:625:test_003()/37 +cmd: $NMCLI con +lang: de_DE.utf8 +returncode: 0 +stdout: 264 bytes +>>> +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +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-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected new file mode 100644 index 0000000000..d4221df506 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:628:test_003()/38 +cmd: $NMCLI -f ALL con +lang: C +returncode: 0 +stdout: 1084 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected new file mode 100644 index 0000000000..c395ba9c9e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:628:test_003()/39 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1088 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected new file mode 100644 index 0000000000..d91d642bb9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:628:test_003()/40 +cmd: $NMCLI -f ALL con +lang: de_DE.utf8 +returncode: 0 +stdout: 1084 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 ja eth0 aktiviert /org/freedesktop/NetworkManager/ActiveConnection/1 -- +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 -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected new file mode 100644 index 0000000000..92d80da3d5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -0,0 +1,90 @@ +location: clients/tests/test-client.py:631:test_003()/41 +cmd: $NMCLI -f ALL con s ethernet +lang: C +returncode: 0 +stdout: 3516 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected new file mode 100644 index 0000000000..73dd00f633 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -0,0 +1,90 @@ +location: clients/tests/test-client.py:631:test_003()/42 +cmd: $NMCLI -f ALL con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 3534 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected new file mode 100644 index 0000000000..a166dc84a9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -0,0 +1,90 @@ +location: clients/tests/test-client.py:631:test_003()/43 +cmd: $NMCLI -f ALL con s ethernet +lang: de_DE.utf8 +returncode: 0 +stdout: 3531 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +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) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nein +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nein +ipv4.ignore-auto-dns: nein +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: ja +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nein +ipv4.may-fail: ja +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nein +ipv6.ignore-auto-dns: nein +ipv6.never-default: nein +ipv6.may-fail: ja +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: ja +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nein +proxy.pac-url: -- +proxy.pac-script: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected new file mode 100644 index 0000000000..2e392c2d02 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:634:test_003()/44 +cmd: $NMCLI con s ethernet +lang: C +returncode: 0 +stdout: 4845 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected new file mode 100644 index 0000000000..4dbccdad81 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:634:test_003()/45 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4869 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected new file mode 100644 index 0000000000..e4737e93cf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:634:test_003()/46 +cmd: $NMCLI con s ethernet +lang: de_DE.utf8 +returncode: 0 +stdout: 4872 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +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) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nein +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nein +ipv4.ignore-auto-dns: nein +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: ja +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nein +ipv4.may-fail: ja +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nein +ipv6.ignore-auto-dns: nein +ipv6.never-default: nein +ipv6.may-fail: ja +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: ja +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nein +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: nein +GENERAL.DEFAULT6: nein +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nein +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: nein +GENERAL.DEFAULT6: nein +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nein +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected new file mode 100644 index 0000000000..6c44511892 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:637:test_003()/47 +cmd: $NMCLI -f ALL dev s eth0 +lang: C +returncode: 0 +stdout: 1056 bytes +>>> +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 + +<<< +stderr: 24 bytes +>>> +Unknown parameter: eth0 + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected new file mode 100644 index 0000000000..1fe6ed0c4c --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:637:test_003()/48 +cmd: $NMCLI -f ALL dev s eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1061 bytes +>>> +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 + +<<< +stderr: 24 bytes +>>> +Nieznany parametr: eth0 + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected new file mode 100644 index 0000000000..5fe88c05d4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -0,0 +1,19 @@ +location: clients/tests/test-client.py:637:test_003()/49 +cmd: $NMCLI -f ALL dev s eth0 +lang: de_DE.utf8 +returncode: 0 +stdout: 1085 bytes +>>> +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 + +<<< +stderr: 28 bytes +>>> +Unbekannter Parameter: eth0 + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected new file mode 100644 index 0000000000..bfd9eaab9e --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:640:test_003()/50 +cmd: $NMCLI -f ALL dev show eth0 +lang: C +returncode: 0 +stdout: 1487 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIRED-PROPERTIES.CARRIER: off +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected new file mode 100644 index 0000000000..ca4c494af2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:640:test_003()/51 +cmd: $NMCLI -f ALL dev show eth0 +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1510 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected new file mode 100644 index 0000000000..2ac807aa7d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -0,0 +1,42 @@ +location: clients/tests/test-client.py:640:test_003()/52 +cmd: $NMCLI -f ALL dev show eth0 +lang: de_DE.utf8 +returncode: 0 +stdout: 1509 bytes +>>> +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (nicht verfügbar) +GENERAL.REASON: 0 (Kein Grund angegeben) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nein +GENERAL.NM-MANAGED: ja +GENERAL.AUTOCONNECT: ja +GENERAL.FIRMWARE-MISSING: nein +GENERAL.NM-PLUGIN-MISSING: nein +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unbekannt +CAPABILITIES.CARRIER-DETECT: nein +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nein +CAPABILITIES.SRIOV: nein +WIRED-PROPERTIES.CARRIER: aus +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 47a588b77d..eec707d27a 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -518,6 +518,8 @@ class TestNmcli(NmTestBase): def init_001(self): self.srv.op_AddObj('WiredDevice', iface = 'eth0') + self.srv.op_AddObj('WiredDevice', + iface = 'eth1') self.srv.op_AddObj('WifiDevice', iface = 'wlan0') self.srv.op_AddObj('WifiDevice', @@ -606,25 +608,36 @@ class TestNmcli(NmTestBase): replace_stdout = replace_stdout, sort_lines_stdout = True) - self.call_nmcli(['con', 'up', 'ethernet', 'ifname', 'eth0']) + # activate the same profile on multiple devices. Our stub-implmentation + # is fine with that... although NetworkManager service would reject + # such a configuration by deactivating the profile first. But note that + # that is only an internal behavior of NetworkManager service. The D-Bus + # API perfectly allows for one profile to be active multiple times. Also + # note, that there is always a short time where one profile goes down, + # while another is activating. Hence, while real NetworkManager commonly + # does not allow that multiple profiles *stay* connected at the same + # time, there is always the possibility that a profile is activating/active + # on a device, while also activating/deactivating in parallel. + for dev in ['eth0', 'eth1']: + self.call_nmcli(['con', 'up', 'ethernet', 'ifname', dev]) - self.call_nmcli_l(['con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'ALL', 'con'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', 'con'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', 'con', 's', 'ethernet'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['con', 's', 'ethernet'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['con', 's', 'ethernet'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'ALL', 'dev', 's', 'eth0'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', 'dev', 's', 'eth0'], + replace_stdout = replace_stdout) - self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'], - replace_stdout = replace_stdout) + self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'], + replace_stdout = replace_stdout) ############################################################################### From c834a8e822a4201c3d18c4c28b2305b292c70f1e Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 21:04:22 +0200 Subject: [PATCH 4/8] tests: don't return path name from obj.get_managed_ifaces() in test-networkmanager-service.py --- tools/test-networkmanager-service.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index fd3c44a0ff..cb045c13a1 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -199,7 +199,7 @@ class ExportedObj(dbus.service.Object): my_ifaces = {} for iface in self._dbus_ifaces: my_ifaces[iface] = self._dbus_ifaces[iface].props - return self.path, my_ifaces + return my_ifaces ############################################################################### @@ -1342,14 +1342,12 @@ class ObjectManager(dbus.service.Object): self.objs = [] def add_object(self, obj): - name, ifaces = obj.get_managed_ifaces() self.objs.append(obj) - self.InterfacesAdded(name, ifaces) + self.InterfacesAdded(obj.path, obj.get_managed_ifaces()) def remove_object(self, obj): - name, ifaces = obj.get_managed_ifaces() self.objs.remove(obj) - self.InterfacesRemoved(name, ifaces.keys()) + self.InterfacesRemoved(obj.path, obj.get_managed_ifaces().keys()) @dbus.service.signal(IFACE_OBJECT_MANAGER, signature='oa{sa{sv}}') def InterfacesAdded(self, name, ifaces): @@ -1365,8 +1363,7 @@ class ObjectManager(dbus.service.Object): def GetManagedObjects(self, sender=None): managed_objects = {} for obj in self.objs: - name, ifaces = obj.get_managed_ifaces() - managed_objects[name] = ifaces + managed_objects[obj.path] = obj.get_managed_ifaces() return managed_objects ############################################################################### From d424de10bf6d2228d36dadf3568a74a3e505e647 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 16:20:00 +0200 Subject: [PATCH 5/8] clients/tests: add SetProperties operation to test-networkmanager-service.py stub It is a hook to set one or several D-Bus properties at once. Properties that are to be set-able, have to be whitelisted in the stub. --- .../test_001-001.expected | 2 +- .../test_001-002.expected | 2 +- .../test_001-003.expected | 2 +- .../test_001-004.expected | 2 +- .../test_001-005.expected | 2 +- .../test_001-006.expected | 2 +- .../test_001-007.expected | 2 +- .../test_001-008.expected | 2 +- .../test_001-009.expected | 2 +- .../test_001-010.expected | 2 +- .../test_001-011.expected | 2 +- .../test_001-012.expected | 2 +- .../test_002-001.expected | 2 +- .../test_002-002.expected | 2 +- .../test_002-003.expected | 2 +- .../test_002-004.expected | 2 +- .../test_002-005.expected | 2 +- .../test_002-006.expected | 2 +- .../test_002-007.expected | 2 +- .../test_002-008.expected | 2 +- .../test_002-009.expected | 2 +- .../test_002-010.expected | 2 +- .../test_002-011.expected | 2 +- .../test_002-012.expected | 2 +- .../test_002-013.expected | 2 +- .../test_002-014.expected | 2 +- .../test_002-015.expected | 2 +- .../test_002-016.expected | 2 +- .../test_002-017.expected | 2 +- .../test_002-018.expected | 2 +- .../test_002-019.expected | 2 +- .../test_002-020.expected | 2 +- .../test_002-021.expected | 2 +- .../test_002-022.expected | 2 +- .../test_002-023.expected | 2 +- .../test_002-024.expected | 2 +- .../test_002-025.expected | 2 +- .../test_002-026.expected | 2 +- .../test_002-027.expected | 2 +- .../test_002-028.expected | 2 +- .../test_002-029.expected | 2 +- .../test_002-030.expected | 2 +- .../test_002-031.expected | 2 +- .../test_002-032.expected | 2 +- .../test_002-033.expected | 2 +- .../test_002-034.expected | 2 +- .../test_002-035.expected | 2 +- .../test_002-036.expected | 2 +- .../test_003-001.expected | 2 +- .../test_003-002.expected | 2 +- .../test_003-003.expected | 2 +- .../test_003-004.expected | 2 +- .../test_003-005.expected | 2 +- .../test_003-006.expected | 2 +- .../test_003-007.expected | 2 +- .../test_003-008.expected | 2 +- .../test_003-009.expected | 2 +- .../test_003-010.expected | 2 +- .../test_003-011.expected | 2 +- .../test_003-012.expected | 2 +- .../test_003-013.expected | 2 +- .../test_003-014.expected | 2 +- .../test_003-015.expected | 2 +- .../test_003-016.expected | 2 +- .../test_003-017.expected | 2 +- .../test_003-018.expected | 2 +- .../test_003-019.expected | 2 +- .../test_003-020.expected | 2 +- .../test_003-021.expected | 2 +- .../test_003-022.expected | 2 +- .../test_003-023.expected | 2 +- .../test_003-024.expected | 2 +- .../test_003-025.expected | 2 +- .../test_003-026.expected | 2 +- .../test_003-027.expected | 2 +- .../test_003-028.expected | 2 +- .../test_003-029.expected | 2 +- .../test_003-030.expected | 2 +- .../test_003-031.expected | 2 +- .../test_003-032.expected | 2 +- .../test_003-033.expected | 2 +- .../test_003-034.expected | 2 +- .../test_003-035.expected | 2 +- .../test_003-036.expected | 2 +- .../test_003-037.expected | 2 +- .../test_003-038.expected | 2 +- .../test_003-039.expected | 2 +- .../test_003-040.expected | 2 +- .../test_003-041.expected | 2 +- .../test_003-042.expected | 2 +- .../test_003-043.expected | 2 +- .../test_003-044.expected | 2 +- .../test_003-045.expected | 2 +- .../test_003-046.expected | 2 +- .../test_003-047.expected | 2 +- .../test_003-048.expected | 2 +- .../test_003-049.expected | 2 +- .../test_003-050.expected | 2 +- .../test_003-051.expected | 2 +- .../test_003-052.expected | 2 +- clients/tests/test-client.py | 11 ++++ tools/test-networkmanager-service.py | 59 +++++++++++++++++-- 102 files changed, 165 insertions(+), 105 deletions(-) diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected index f439652a09..53d0290fe9 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:553:test_001()/1 +location: clients/tests/test-client.py:564: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 74a3e21a4f..eb423567fb 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:553:test_001()/2 +location: clients/tests/test-client.py:564: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 4817859338..bb033632e8 100644 --- a/clients/tests/test-client.check-on-disk/test_001-003.expected +++ b/clients/tests/test-client.check-on-disk/test_001-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:553:test_001()/3 +location: clients/tests/test-client.py:564:test_001()/3 cmd: $NMCLI lang: de_DE.utf8 returncode: 0 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 a7d604cf21..bb513a7356 100644 --- a/clients/tests/test-client.check-on-disk/test_001-004.expected +++ b/clients/tests/test-client.check-on-disk/test_001-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:555:test_001()/4 +location: clients/tests/test-client.py:566:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected index 75f8b95611..b08584ac08 100644 --- a/clients/tests/test-client.check-on-disk/test_001-005.expected +++ b/clients/tests/test-client.check-on-disk/test_001-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:555:test_001()/5 +location: clients/tests/test-client.py:566:test_001()/5 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected index ac49bb1c83..7b0ff91232 100644 --- a/clients/tests/test-client.check-on-disk/test_001-006.expected +++ b/clients/tests/test-client.check-on-disk/test_001-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:555:test_001()/6 +location: clients/tests/test-client.py:566:test_001()/6 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: de_DE.utf8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected index 39bb04c3c8..06ecc70a74 100644 --- a/clients/tests/test-client.check-on-disk/test_001-007.expected +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:557:test_001()/7 +location: clients/tests/test-client.py:568:test_001()/7 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected index 3ece98808e..0c919875c7 100644 --- a/clients/tests/test-client.check-on-disk/test_001-008.expected +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:557:test_001()/8 +location: clients/tests/test-client.py:568:test_001()/8 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected index 3973dde1d4..562588cf0d 100644 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ b/clients/tests/test-client.check-on-disk/test_001-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:557:test_001()/9 +location: clients/tests/test-client.py:568:test_001()/9 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected index 7b6c32d427..79efe062d6 100644 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ b/clients/tests/test-client.check-on-disk/test_001-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:559:test_001()/10 +location: clients/tests/test-client.py:570:test_001()/10 cmd: $NMCLI bogus s lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected index 182191a658..d220cfb43d 100644 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:559:test_001()/11 +location: clients/tests/test-client.py:570:test_001()/11 cmd: $NMCLI bogus s lang: pl_PL.UTF-8 returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected index 367cc18469..440ec60735 100644 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:559:test_001()/12 +location: clients/tests/test-client.py:570:test_001()/12 cmd: $NMCLI bogus s lang: de_DE.utf8 returncode: 2 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 266fb1dc20..7dc32b0135 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:564:test_002()/1 +location: clients/tests/test-client.py:575: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 42ab10b8bf..65ed20d1ce 100644 --- a/clients/tests/test-client.check-on-disk/test_002-002.expected +++ b/clients/tests/test-client.check-on-disk/test_002-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:564:test_002()/2 +location: clients/tests/test-client.py:575:test_002()/2 cmd: $NMCLI d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected index d2cd4203c1..ce265b6c3a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-003.expected +++ b/clients/tests/test-client.check-on-disk/test_002-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:564:test_002()/3 +location: clients/tests/test-client.py:575:test_002()/3 cmd: $NMCLI d lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected index 04141802ff..7da578760a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-004.expected +++ b/clients/tests/test-client.check-on-disk/test_002-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:566:test_002()/4 +location: clients/tests/test-client.py:577:test_002()/4 cmd: $NMCLI -f all d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected index 73e028b951..25b954c33c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-005.expected +++ b/clients/tests/test-client.check-on-disk/test_002-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:566:test_002()/5 +location: clients/tests/test-client.py:577:test_002()/5 cmd: $NMCLI -f all d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected index 3ccedade36..46f92e87fc 100644 --- a/clients/tests/test-client.check-on-disk/test_002-006.expected +++ b/clients/tests/test-client.check-on-disk/test_002-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:566:test_002()/6 +location: clients/tests/test-client.py:577:test_002()/6 cmd: $NMCLI -f all d lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected index 9d33e74773..821c1b1858 100644 --- a/clients/tests/test-client.check-on-disk/test_002-007.expected +++ b/clients/tests/test-client.check-on-disk/test_002-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:568:test_002()/7 +location: clients/tests/test-client.py:579:test_002()/7 cmd: $NMCLI lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected index 1128fb267b..23f3d8563f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-008.expected +++ b/clients/tests/test-client.check-on-disk/test_002-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:568:test_002()/8 +location: clients/tests/test-client.py:579:test_002()/8 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected index e3b1321615..065147a702 100644 --- a/clients/tests/test-client.check-on-disk/test_002-009.expected +++ b/clients/tests/test-client.check-on-disk/test_002-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:568:test_002()/9 +location: clients/tests/test-client.py:579:test_002()/9 cmd: $NMCLI lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected index c2dbfd4bef..6edba3afd2 100644 --- a/clients/tests/test-client.check-on-disk/test_002-010.expected +++ b/clients/tests/test-client.check-on-disk/test_002-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:570:test_002()/10 +location: clients/tests/test-client.py:581:test_002()/10 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected index 001d45399b..60b450f833 100644 --- a/clients/tests/test-client.check-on-disk/test_002-011.expected +++ b/clients/tests/test-client.check-on-disk/test_002-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:570:test_002()/11 +location: clients/tests/test-client.py:581:test_002()/11 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected index 8edda84617..cf151638f7 100644 --- a/clients/tests/test-client.check-on-disk/test_002-012.expected +++ b/clients/tests/test-client.check-on-disk/test_002-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:570:test_002()/12 +location: clients/tests/test-client.py:581:test_002()/12 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected index a2261cf2c2..60879e2c5d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-013.expected +++ b/clients/tests/test-client.check-on-disk/test_002-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:571:test_002()/13 +location: clients/tests/test-client.py:582:test_002()/13 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected index c7d322fea5..c78b7ac650 100644 --- a/clients/tests/test-client.check-on-disk/test_002-014.expected +++ b/clients/tests/test-client.check-on-disk/test_002-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:571:test_002()/14 +location: clients/tests/test-client.py:582:test_002()/14 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected index 3f03f76dc8..5c54169ee8 100644 --- a/clients/tests/test-client.check-on-disk/test_002-015.expected +++ b/clients/tests/test-client.check-on-disk/test_002-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:571:test_002()/15 +location: clients/tests/test-client.py:582:test_002()/15 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected index 06f74b2ed1..c7df39be02 100644 --- a/clients/tests/test-client.check-on-disk/test_002-016.expected +++ b/clients/tests/test-client.check-on-disk/test_002-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:572:test_002()/16 +location: clients/tests/test-client.py:583:test_002()/16 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected index c7728ca274..8d09ae7f6a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-017.expected +++ b/clients/tests/test-client.check-on-disk/test_002-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:572:test_002()/17 +location: clients/tests/test-client.py:583:test_002()/17 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected index 20507aa66f..23d3cd2362 100644 --- a/clients/tests/test-client.check-on-disk/test_002-018.expected +++ b/clients/tests/test-client.check-on-disk/test_002-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:572:test_002()/18 +location: clients/tests/test-client.py:583:test_002()/18 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected index 01876995a4..c0aff64f6d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-019.expected +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:573:test_002()/19 +location: clients/tests/test-client.py:584:test_002()/19 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected index 212f99a8ec..b9f9825f1e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-020.expected +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:573:test_002()/20 +location: clients/tests/test-client.py:584:test_002()/20 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected index d52ad2de64..20fd56fb29 100644 --- a/clients/tests/test-client.check-on-disk/test_002-021.expected +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:573:test_002()/21 +location: clients/tests/test-client.py:584:test_002()/21 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected index b48011dd32..33e04d1905 100644 --- a/clients/tests/test-client.check-on-disk/test_002-022.expected +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:574:test_002()/22 +location: clients/tests/test-client.py:585:test_002()/22 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected index 5973b9a351..115ce69c43 100644 --- a/clients/tests/test-client.check-on-disk/test_002-023.expected +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:574:test_002()/23 +location: clients/tests/test-client.py:585:test_002()/23 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected index 67fbb0b82c..84f11a4a90 100644 --- a/clients/tests/test-client.check-on-disk/test_002-024.expected +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:574:test_002()/24 +location: clients/tests/test-client.py:585:test_002()/24 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: de_DE.utf8 returncode: 0 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 index f0ff60da35..9d007d6a1a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-025.expected +++ b/clients/tests/test-client.check-on-disk/test_002-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:575:test_002()/25 +location: clients/tests/test-client.py:586:test_002()/25 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-026.expected b/clients/tests/test-client.check-on-disk/test_002-026.expected index 0e28e9737e..f4fb3ee11b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-026.expected +++ b/clients/tests/test-client.check-on-disk/test_002-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:575:test_002()/26 +location: clients/tests/test-client.py:586:test_002()/26 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-027.expected b/clients/tests/test-client.check-on-disk/test_002-027.expected index 49d2569f20..e1cbb8d684 100644 --- a/clients/tests/test-client.check-on-disk/test_002-027.expected +++ b/clients/tests/test-client.check-on-disk/test_002-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:575:test_002()/27 +location: clients/tests/test-client.py:586:test_002()/27 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: de_DE.utf8 returncode: 0 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 index 48ed78797a..776f9b9ee9 100644 --- a/clients/tests/test-client.check-on-disk/test_002-028.expected +++ b/clients/tests/test-client.check-on-disk/test_002-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_002()/28 +location: clients/tests/test-client.py:588:test_002()/28 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 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 index 8dc2ffd971..52e1a83581 100644 --- a/clients/tests/test-client.check-on-disk/test_002-029.expected +++ b/clients/tests/test-client.check-on-disk/test_002-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_002()/29 +location: clients/tests/test-client.py:588:test_002()/29 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-030.expected b/clients/tests/test-client.check-on-disk/test_002-030.expected index c80843650b..9ac49f07dd 100644 --- a/clients/tests/test-client.check-on-disk/test_002-030.expected +++ b/clients/tests/test-client.check-on-disk/test_002-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_002()/30 +location: clients/tests/test-client.py:588:test_002()/30 cmd: $NMCLI -f ALL d wifi lang: de_DE.utf8 returncode: 0 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 index e98814e6bd..75d1a7d90b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-031.expected +++ b/clients/tests/test-client.check-on-disk/test_002-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_002()/31 +location: clients/tests/test-client.py:590:test_002()/31 cmd: $NMCLI c lang: C returncode: 0 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 index a77fedab46..caf7e395a2 100644 --- a/clients/tests/test-client.check-on-disk/test_002-032.expected +++ b/clients/tests/test-client.check-on-disk/test_002-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_002()/32 +location: clients/tests/test-client.py:590:test_002()/32 cmd: $NMCLI c lang: pl_PL.UTF-8 returncode: 0 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 index b616767432..51f828dfbf 100644 --- a/clients/tests/test-client.check-on-disk/test_002-033.expected +++ b/clients/tests/test-client.check-on-disk/test_002-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_002()/33 +location: clients/tests/test-client.py:590:test_002()/33 cmd: $NMCLI c lang: de_DE.utf8 returncode: 0 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 index bfcf4ceb16..50d713d0d1 100644 --- a/clients/tests/test-client.check-on-disk/test_002-034.expected +++ b/clients/tests/test-client.check-on-disk/test_002-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:581:test_002()/34 +location: clients/tests/test-client.py:592:test_002()/34 cmd: $NMCLI c s con-1 lang: C returncode: 0 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 index bc5b468cfd..8c84e56893 100644 --- a/clients/tests/test-client.check-on-disk/test_002-035.expected +++ b/clients/tests/test-client.check-on-disk/test_002-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:581:test_002()/35 +location: clients/tests/test-client.py:592:test_002()/35 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 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 index 1ec82a91f5..5ed52474ab 100644 --- a/clients/tests/test-client.check-on-disk/test_002-036.expected +++ b/clients/tests/test-client.check-on-disk/test_002-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:581:test_002()/36 +location: clients/tests/test-client.py:592:test_002()/36 cmd: $NMCLI c s con-1 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected index b012f820fa..d4d4fb8419 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:591:test_003()/1 +location: clients/tests/test-client.py:602: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 4703b77689..1d7edd992e 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:594:test_003()/2 +location: clients/tests/test-client.py:605: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 a270565183..4d2ca109e7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-003.expected +++ b/clients/tests/test-client.check-on-disk/test_003-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:594:test_003()/3 +location: clients/tests/test-client.py:605:test_003()/3 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected index e215769fe9..079dbc7f85 100644 --- a/clients/tests/test-client.check-on-disk/test_003-004.expected +++ b/clients/tests/test-client.check-on-disk/test_003-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:594:test_003()/4 +location: clients/tests/test-client.py:605:test_003()/4 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected index f37dd9e297..7035c3e949 100644 --- a/clients/tests/test-client.check-on-disk/test_003-005.expected +++ b/clients/tests/test-client.check-on-disk/test_003-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:599:test_003()/5 +location: clients/tests/test-client.py:610:test_003()/5 cmd: $NMCLI c add type ethernet ifname '*' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected index c077a68469..01960ad8d1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-006.expected +++ b/clients/tests/test-client.check-on-disk/test_003-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:602:test_003()/6 +location: clients/tests/test-client.py:613:test_003()/6 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected index 9fbb51e649..867738c96d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-007.expected +++ b/clients/tests/test-client.check-on-disk/test_003-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:602:test_003()/7 +location: clients/tests/test-client.py:613:test_003()/7 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected index 09132397cf..e72450eab5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-008.expected +++ b/clients/tests/test-client.check-on-disk/test_003-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:602:test_003()/8 +location: clients/tests/test-client.py:613:test_003()/8 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected index 17eeb70b8f..6edd4b00a0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-009.expected +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:605:test_003()/9 +location: clients/tests/test-client.py:616:test_003()/9 cmd: $NMCLI -f ALL c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected index d15bc3a95e..0698d3a9dd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-010.expected +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:605:test_003()/10 +location: clients/tests/test-client.py:616:test_003()/10 cmd: $NMCLI -f ALL c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected index 4f74030f25..f89b14b824 100644 --- a/clients/tests/test-client.check-on-disk/test_003-011.expected +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:605:test_003()/11 +location: clients/tests/test-client.py:616:test_003()/11 cmd: $NMCLI -f ALL c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected index 1223b93e49..407742902c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-012.expected +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:609:test_003()/12 +location: clients/tests/test-client.py:620:test_003()/12 cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected index 72e2b62897..a8fbb9ff10 100644 --- a/clients/tests/test-client.check-on-disk/test_003-013.expected +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:609:test_003()/13 +location: clients/tests/test-client.py:620:test_003()/13 cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected index c4ddaecd94..6708eb38d0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-014.expected +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:609:test_003()/14 +location: clients/tests/test-client.py:620:test_003()/14 cmd: $NMCLI --complete-args -f ALL c s '' lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected index ac447c04c9..a257841958 100644 --- a/clients/tests/test-client.check-on-disk/test_003-015.expected +++ b/clients/tests/test-client.check-on-disk/test_003-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:622:test_003()/15 +location: clients/tests/test-client.py:633:test_003()/15 cmd: $NMCLI con up ethernet ifname eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected index 047da09801..2cadf2c710 100644 --- a/clients/tests/test-client.check-on-disk/test_003-016.expected +++ b/clients/tests/test-client.check-on-disk/test_003-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:625:test_003()/16 +location: clients/tests/test-client.py:636:test_003()/16 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected index 0cf9978d57..9dc45ff69f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-017.expected +++ b/clients/tests/test-client.check-on-disk/test_003-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:625:test_003()/17 +location: clients/tests/test-client.py:636:test_003()/17 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected index c292cd5b10..d4f3ab9f17 100644 --- a/clients/tests/test-client.check-on-disk/test_003-018.expected +++ b/clients/tests/test-client.check-on-disk/test_003-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:625:test_003()/18 +location: clients/tests/test-client.py:636:test_003()/18 cmd: $NMCLI con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected index 5c71907fd2..0cd1711c89 100644 --- a/clients/tests/test-client.check-on-disk/test_003-019.expected +++ b/clients/tests/test-client.check-on-disk/test_003-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:628:test_003()/19 +location: clients/tests/test-client.py:639:test_003()/19 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected index 7d2443a7fe..47e8ceba31 100644 --- a/clients/tests/test-client.check-on-disk/test_003-020.expected +++ b/clients/tests/test-client.check-on-disk/test_003-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:628:test_003()/20 +location: clients/tests/test-client.py:639:test_003()/20 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected index f89f5c386f..704ceb599a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-021.expected +++ b/clients/tests/test-client.check-on-disk/test_003-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:628:test_003()/21 +location: clients/tests/test-client.py:639:test_003()/21 cmd: $NMCLI -f ALL con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected index bcfda75db8..513dc8a1ae 100644 --- a/clients/tests/test-client.check-on-disk/test_003-022.expected +++ b/clients/tests/test-client.check-on-disk/test_003-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:631:test_003()/22 +location: clients/tests/test-client.py:642:test_003()/22 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected index 7a1d42faa5..a188ae8461 100644 --- a/clients/tests/test-client.check-on-disk/test_003-023.expected +++ b/clients/tests/test-client.check-on-disk/test_003-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:631:test_003()/23 +location: clients/tests/test-client.py:642:test_003()/23 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected index 14d323b669..fb2f4b6891 100644 --- a/clients/tests/test-client.check-on-disk/test_003-024.expected +++ b/clients/tests/test-client.check-on-disk/test_003-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:631:test_003()/24 +location: clients/tests/test-client.py:642:test_003()/24 cmd: $NMCLI -f ALL con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected index 0346ccfde6..8aedcaf974 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:634:test_003()/25 +location: clients/tests/test-client.py:645:test_003()/25 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected index 0eeee627d3..b299c60f87 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:634:test_003()/26 +location: clients/tests/test-client.py:645:test_003()/26 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected index 1038611d78..1219d2034b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:634:test_003()/27 +location: clients/tests/test-client.py:645:test_003()/27 cmd: $NMCLI con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected index f4a92c53b8..8162c99432 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:637:test_003()/28 +location: clients/tests/test-client.py:648:test_003()/28 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected index 9ac6479762..6e7e0a50a5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:637:test_003()/29 +location: clients/tests/test-client.py:648:test_003()/29 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index 6d6102114e..0ab4cb68ac 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:637:test_003()/30 +location: clients/tests/test-client.py:648:test_003()/30 cmd: $NMCLI -f ALL dev s eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index 9745dd08d7..04035d2c9e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:640:test_003()/31 +location: clients/tests/test-client.py:651:test_003()/31 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected index 0dd7ee606b..53304af3dd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-032.expected +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:640:test_003()/32 +location: clients/tests/test-client.py:651:test_003()/32 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected index 8c8cb10fb1..b2c0e334c9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-033.expected +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:640:test_003()/33 +location: clients/tests/test-client.py:651:test_003()/33 cmd: $NMCLI -f ALL dev show eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected index 45679c36a7..596ad5c3a8 100644 --- a/clients/tests/test-client.check-on-disk/test_003-034.expected +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:622:test_003()/34 +location: clients/tests/test-client.py:633:test_003()/34 cmd: $NMCLI con up ethernet ifname eth1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected index 4efb855eae..419d6360d7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-035.expected +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:625:test_003()/35 +location: clients/tests/test-client.py:636:test_003()/35 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected index 309b1682c6..e62faecc60 100644 --- a/clients/tests/test-client.check-on-disk/test_003-036.expected +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:625:test_003()/36 +location: clients/tests/test-client.py:636:test_003()/36 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected index 052a6f49fe..a234a7e605 100644 --- a/clients/tests/test-client.check-on-disk/test_003-037.expected +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:625:test_003()/37 +location: clients/tests/test-client.py:636:test_003()/37 cmd: $NMCLI con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected index d4221df506..3b84da32e0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-038.expected +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:628:test_003()/38 +location: clients/tests/test-client.py:639:test_003()/38 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected index c395ba9c9e..acb1721d0b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-039.expected +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:628:test_003()/39 +location: clients/tests/test-client.py:639:test_003()/39 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected index d91d642bb9..df96e49929 100644 --- a/clients/tests/test-client.check-on-disk/test_003-040.expected +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:628:test_003()/40 +location: clients/tests/test-client.py:639:test_003()/40 cmd: $NMCLI -f ALL con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected index 92d80da3d5..b0fb5cf4ef 100644 --- a/clients/tests/test-client.check-on-disk/test_003-041.expected +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:631:test_003()/41 +location: clients/tests/test-client.py:642:test_003()/41 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected index 73dd00f633..a26f7a400a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-042.expected +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:631:test_003()/42 +location: clients/tests/test-client.py:642:test_003()/42 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected index a166dc84a9..e9f3d63879 100644 --- a/clients/tests/test-client.check-on-disk/test_003-043.expected +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:631:test_003()/43 +location: clients/tests/test-client.py:642:test_003()/43 cmd: $NMCLI -f ALL con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected index 2e392c2d02..9e97da426c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-044.expected +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:634:test_003()/44 +location: clients/tests/test-client.py:645:test_003()/44 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected index 4dbccdad81..ae5d163ef4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-045.expected +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:634:test_003()/45 +location: clients/tests/test-client.py:645:test_003()/45 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected index e4737e93cf..f78eb84cad 100644 --- a/clients/tests/test-client.check-on-disk/test_003-046.expected +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:634:test_003()/46 +location: clients/tests/test-client.py:645:test_003()/46 cmd: $NMCLI con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected index 6c44511892..eaddf1102b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-047.expected +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:637:test_003()/47 +location: clients/tests/test-client.py:648:test_003()/47 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected index 1fe6ed0c4c..863bc01e25 100644 --- a/clients/tests/test-client.check-on-disk/test_003-048.expected +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:637:test_003()/48 +location: clients/tests/test-client.py:648:test_003()/48 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected index 5fe88c05d4..dd52b8fded 100644 --- a/clients/tests/test-client.check-on-disk/test_003-049.expected +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:637:test_003()/49 +location: clients/tests/test-client.py:648:test_003()/49 cmd: $NMCLI -f ALL dev s eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected index bfd9eaab9e..b300891387 100644 --- a/clients/tests/test-client.check-on-disk/test_003-050.expected +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:640:test_003()/50 +location: clients/tests/test-client.py:651:test_003()/50 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected index ca4c494af2..c1fd9e1d34 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:640:test_003()/51 +location: clients/tests/test-client.py:651:test_003()/51 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected index 2ac807aa7d..2e3eb15194 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:640:test_003()/52 +location: clients/tests/test-client.py:651:test_003()/52 cmd: $NMCLI -f ALL dev show eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index eec707d27a..8197d80c4f 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -243,6 +243,17 @@ class NMStubServer: raise AssertionError("Unexpectedly not found connection %s: %s" % (con_id, str(e))) return u + def setProperty(self, path, propname, value, iface_name = None): + if iface_name is None: + iface_name = '' + self.op_SetProperties([ + (path, [ + (iface_name, [ + (propname, value), + ]), + ]), + ]) + ############################################################################### class NmTestBase(unittest.TestCase): diff --git a/tools/test-networkmanager-service.py b/tools/test-networkmanager-service.py index cb045c13a1..9b4d3c8c29 100755 --- a/tools/test-networkmanager-service.py +++ b/tools/test-networkmanager-service.py @@ -160,11 +160,40 @@ class ExportedObj(dbus.service.Object): return self._dbus_interface_get_property(self._dbus_interface_get(dbus_iface), propname) - def _dbus_property_set(self, dbus_iface, propname, value): - dbus_interface = self._dbus_interface_get(dbus_iface) - prop = self._dbus_interface_get_property(dbus_interface) - assert propname in prop - prop[propname] = value + def _dbus_property_set(self, dbus_iface, propname, value, allow_detect_dbus_iface = False, dry_run = False): + if allow_detect_dbus_iface and not dbus_iface: + props = None + for p, dbus_interface in self._dbus_ifaces.items(): + if propname in dbus_interface.props: + if props is not None: + raise TestError("Cannot uniquely find the property '%s' on object '%s'" % (propname, self.path)) + props = dbus_interface.props + dbus_iface = p + if props is None: + raise TestError("Cannot find the property '%s' on object '%s'" % (propname, self.path)) + else: + try: + dbus_interface = self._dbus_interface_get(dbus_iface) + props = self._dbus_interface_get_property(dbus_interface) + except: + if dry_run: + raise TestError("No interface '%s' on '%s'" % (dbus_iface, self.path)) + raise + + if dry_run: + if propname not in props: + raise TestError("No property '%s' on '%s' on '%s'" % (propname, dbus_iface, self.path)) + + if isinstance(self, ActiveConnection) \ + and dbus_iface == 'org.freedesktop.NetworkManager.Connection.Active' \ + and propname == 'State': + return + else: + raise TestError("Cannot set property '%s' on '%s' on '%s' via D-Bus" % (propname, dbus_iface, self.path)) + + assert propname in props + + props[propname] = value self._dbus_property_notify(dbus_iface, propname) def _dbus_property_notify(self, dbus_iface, propname): @@ -942,6 +971,20 @@ class NetworkManager(ExportedObj): def FindConnections(self, args): return [(c.path, c.get_uuid(), c.get_id()) for c in gl.settings.find_connections(**args)] + @dbus.service.method(IFACE_TEST, in_signature='a(oa(sa(sv)))', out_signature='') + def SetProperties(self, all_args): + for i in [0, 1]: + for path, iface_args in all_args: + o = gl.object_manager.find_object(path) + if o is None: + raise TestError("Object %s does not exist" % (path)) + for iface_name, args in iface_args: + for propname, value in args: + o._dbus_property_set(iface_name, propname, value, + allow_detect_dbus_iface = True, + dry_run = (i == 0)) + + @dbus.service.method(IFACE_TEST, in_signature='sa{sv}', out_signature='o') def AddObj(self, class_name, args): if class_name in ['WiredDevice', 'WifiDevice']: @@ -1341,6 +1384,12 @@ class ObjectManager(dbus.service.Object): dbus.service.Object.__init__(self, gl.bus, object_path) self.objs = [] + def find_object(self, path): + for o in self.objs: + if path == o.path: + return o + return None + def add_object(self, obj): self.objs.append(obj) self.InterfacesAdded(obj.path, obj.get_managed_ifaces()) From 6f82c880a655509b18ad384e6c2cc5f67a4d0377 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 16:38:51 +0200 Subject: [PATCH 6/8] clients/tests: load libnm via GObject introspection We will use it, and it must be available anyway, because the stub server also requires it. --- .../test-client.check-on-disk/test_001-001.expected | 2 +- .../test-client.check-on-disk/test_001-002.expected | 2 +- .../test-client.check-on-disk/test_001-003.expected | 2 +- .../test-client.check-on-disk/test_001-004.expected | 2 +- .../test-client.check-on-disk/test_001-005.expected | 2 +- .../test-client.check-on-disk/test_001-006.expected | 2 +- .../test-client.check-on-disk/test_001-007.expected | 2 +- .../test-client.check-on-disk/test_001-008.expected | 2 +- .../test-client.check-on-disk/test_001-009.expected | 2 +- .../test-client.check-on-disk/test_001-010.expected | 2 +- .../test-client.check-on-disk/test_001-011.expected | 2 +- .../test-client.check-on-disk/test_001-012.expected | 2 +- .../test-client.check-on-disk/test_002-001.expected | 2 +- .../test-client.check-on-disk/test_002-002.expected | 2 +- .../test-client.check-on-disk/test_002-003.expected | 2 +- .../test-client.check-on-disk/test_002-004.expected | 2 +- .../test-client.check-on-disk/test_002-005.expected | 2 +- .../test-client.check-on-disk/test_002-006.expected | 2 +- .../test-client.check-on-disk/test_002-007.expected | 2 +- .../test-client.check-on-disk/test_002-008.expected | 2 +- .../test-client.check-on-disk/test_002-009.expected | 2 +- .../test-client.check-on-disk/test_002-010.expected | 2 +- .../test-client.check-on-disk/test_002-011.expected | 2 +- .../test-client.check-on-disk/test_002-012.expected | 2 +- .../test-client.check-on-disk/test_002-013.expected | 2 +- .../test-client.check-on-disk/test_002-014.expected | 2 +- .../test-client.check-on-disk/test_002-015.expected | 2 +- .../test-client.check-on-disk/test_002-016.expected | 2 +- .../test-client.check-on-disk/test_002-017.expected | 2 +- .../test-client.check-on-disk/test_002-018.expected | 2 +- .../test-client.check-on-disk/test_002-019.expected | 2 +- .../test-client.check-on-disk/test_002-020.expected | 2 +- .../test-client.check-on-disk/test_002-021.expected | 2 +- .../test-client.check-on-disk/test_002-022.expected | 2 +- .../test-client.check-on-disk/test_002-023.expected | 2 +- .../test-client.check-on-disk/test_002-024.expected | 2 +- .../test-client.check-on-disk/test_002-025.expected | 2 +- .../test-client.check-on-disk/test_002-026.expected | 2 +- .../test-client.check-on-disk/test_002-027.expected | 2 +- .../test-client.check-on-disk/test_002-028.expected | 2 +- .../test-client.check-on-disk/test_002-029.expected | 2 +- .../test-client.check-on-disk/test_002-030.expected | 2 +- .../test-client.check-on-disk/test_002-031.expected | 2 +- .../test-client.check-on-disk/test_002-032.expected | 2 +- .../test-client.check-on-disk/test_002-033.expected | 2 +- .../test-client.check-on-disk/test_002-034.expected | 2 +- .../test-client.check-on-disk/test_002-035.expected | 2 +- .../test-client.check-on-disk/test_002-036.expected | 2 +- .../test-client.check-on-disk/test_003-001.expected | 2 +- .../test-client.check-on-disk/test_003-002.expected | 2 +- .../test-client.check-on-disk/test_003-003.expected | 2 +- .../test-client.check-on-disk/test_003-004.expected | 2 +- .../test-client.check-on-disk/test_003-005.expected | 2 +- .../test-client.check-on-disk/test_003-006.expected | 2 +- .../test-client.check-on-disk/test_003-007.expected | 2 +- .../test-client.check-on-disk/test_003-008.expected | 2 +- .../test-client.check-on-disk/test_003-009.expected | 2 +- .../test-client.check-on-disk/test_003-010.expected | 2 +- .../test-client.check-on-disk/test_003-011.expected | 2 +- .../test-client.check-on-disk/test_003-012.expected | 2 +- .../test-client.check-on-disk/test_003-013.expected | 2 +- .../test-client.check-on-disk/test_003-014.expected | 2 +- .../test-client.check-on-disk/test_003-015.expected | 2 +- .../test-client.check-on-disk/test_003-016.expected | 2 +- .../test-client.check-on-disk/test_003-017.expected | 2 +- .../test-client.check-on-disk/test_003-018.expected | 2 +- .../test-client.check-on-disk/test_003-019.expected | 2 +- .../test-client.check-on-disk/test_003-020.expected | 2 +- .../test-client.check-on-disk/test_003-021.expected | 2 +- .../test-client.check-on-disk/test_003-022.expected | 2 +- .../test-client.check-on-disk/test_003-023.expected | 2 +- .../test-client.check-on-disk/test_003-024.expected | 2 +- .../test-client.check-on-disk/test_003-025.expected | 2 +- .../test-client.check-on-disk/test_003-026.expected | 2 +- .../test-client.check-on-disk/test_003-027.expected | 2 +- .../test-client.check-on-disk/test_003-028.expected | 2 +- .../test-client.check-on-disk/test_003-029.expected | 2 +- .../test-client.check-on-disk/test_003-030.expected | 2 +- .../test-client.check-on-disk/test_003-031.expected | 2 +- .../test-client.check-on-disk/test_003-032.expected | 2 +- .../test-client.check-on-disk/test_003-033.expected | 2 +- .../test-client.check-on-disk/test_003-034.expected | 2 +- .../test-client.check-on-disk/test_003-035.expected | 2 +- .../test-client.check-on-disk/test_003-036.expected | 2 +- .../test-client.check-on-disk/test_003-037.expected | 2 +- .../test-client.check-on-disk/test_003-038.expected | 2 +- .../test-client.check-on-disk/test_003-039.expected | 2 +- .../test-client.check-on-disk/test_003-040.expected | 2 +- .../test-client.check-on-disk/test_003-041.expected | 2 +- .../test-client.check-on-disk/test_003-042.expected | 2 +- .../test-client.check-on-disk/test_003-043.expected | 2 +- .../test-client.check-on-disk/test_003-044.expected | 2 +- .../test-client.check-on-disk/test_003-045.expected | 2 +- .../test-client.check-on-disk/test_003-046.expected | 2 +- .../test-client.check-on-disk/test_003-047.expected | 2 +- .../test-client.check-on-disk/test_003-048.expected | 2 +- .../test-client.check-on-disk/test_003-049.expected | 2 +- .../test-client.check-on-disk/test_003-050.expected | 2 +- .../test-client.check-on-disk/test_003-051.expected | 2 +- .../test-client.check-on-disk/test_003-052.expected | 2 +- clients/tests/test-client.py | 13 +++++++++++++ 101 files changed, 113 insertions(+), 100 deletions(-) diff --git a/clients/tests/test-client.check-on-disk/test_001-001.expected b/clients/tests/test-client.check-on-disk/test_001-001.expected index 53d0290fe9..6132deea3f 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:564:test_001()/1 +location: clients/tests/test-client.py:577: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 eb423567fb..75b8827e3d 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:564:test_001()/2 +location: clients/tests/test-client.py:577: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 bb033632e8..2ddf350e6c 100644 --- a/clients/tests/test-client.check-on-disk/test_001-003.expected +++ b/clients/tests/test-client.check-on-disk/test_001-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:564:test_001()/3 +location: clients/tests/test-client.py:577:test_001()/3 cmd: $NMCLI lang: de_DE.utf8 returncode: 0 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 bb513a7356..8d34526cf4 100644 --- a/clients/tests/test-client.check-on-disk/test_001-004.expected +++ b/clients/tests/test-client.check-on-disk/test_001-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:566:test_001()/4 +location: clients/tests/test-client.py:579:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-005.expected b/clients/tests/test-client.check-on-disk/test_001-005.expected index b08584ac08..84b1bc6572 100644 --- a/clients/tests/test-client.check-on-disk/test_001-005.expected +++ b/clients/tests/test-client.check-on-disk/test_001-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:566:test_001()/5 +location: clients/tests/test-client.py:579:test_001()/5 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-006.expected b/clients/tests/test-client.check-on-disk/test_001-006.expected index 7b0ff91232..949c2297c0 100644 --- a/clients/tests/test-client.check-on-disk/test_001-006.expected +++ b/clients/tests/test-client.check-on-disk/test_001-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:566:test_001()/6 +location: clients/tests/test-client.py:579:test_001()/6 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: de_DE.utf8 returncode: 10 diff --git a/clients/tests/test-client.check-on-disk/test_001-007.expected b/clients/tests/test-client.check-on-disk/test_001-007.expected index 06ecc70a74..0169df6a8e 100644 --- a/clients/tests/test-client.check-on-disk/test_001-007.expected +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:568:test_001()/7 +location: clients/tests/test-client.py:581:test_001()/7 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected index 0c919875c7..284218b1e3 100644 --- a/clients/tests/test-client.check-on-disk/test_001-008.expected +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:568:test_001()/8 +location: clients/tests/test-client.py:581:test_001()/8 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected index 562588cf0d..4bb5543d13 100644 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ b/clients/tests/test-client.check-on-disk/test_001-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:568:test_001()/9 +location: clients/tests/test-client.py:581:test_001()/9 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_001-010.expected b/clients/tests/test-client.check-on-disk/test_001-010.expected index 79efe062d6..b1fcaf2030 100644 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ b/clients/tests/test-client.check-on-disk/test_001-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:570:test_001()/10 +location: clients/tests/test-client.py:583:test_001()/10 cmd: $NMCLI bogus s lang: C returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-011.expected b/clients/tests/test-client.check-on-disk/test_001-011.expected index d220cfb43d..5e045778ac 100644 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ b/clients/tests/test-client.check-on-disk/test_001-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:570:test_001()/11 +location: clients/tests/test-client.py:583:test_001()/11 cmd: $NMCLI bogus s lang: pl_PL.UTF-8 returncode: 2 diff --git a/clients/tests/test-client.check-on-disk/test_001-012.expected b/clients/tests/test-client.check-on-disk/test_001-012.expected index 440ec60735..d8be06f7d2 100644 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ b/clients/tests/test-client.check-on-disk/test_001-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:570:test_001()/12 +location: clients/tests/test-client.py:583:test_001()/12 cmd: $NMCLI bogus s lang: de_DE.utf8 returncode: 2 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 7dc32b0135..b9f7ead5ed 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:575:test_002()/1 +location: clients/tests/test-client.py:588: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 65ed20d1ce..7c690db925 100644 --- a/clients/tests/test-client.check-on-disk/test_002-002.expected +++ b/clients/tests/test-client.check-on-disk/test_002-002.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:575:test_002()/2 +location: clients/tests/test-client.py:588:test_002()/2 cmd: $NMCLI d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected index ce265b6c3a..30e21f760f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-003.expected +++ b/clients/tests/test-client.check-on-disk/test_002-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:575:test_002()/3 +location: clients/tests/test-client.py:588:test_002()/3 cmd: $NMCLI d lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-004.expected b/clients/tests/test-client.check-on-disk/test_002-004.expected index 7da578760a..ad5317c1d3 100644 --- a/clients/tests/test-client.check-on-disk/test_002-004.expected +++ b/clients/tests/test-client.check-on-disk/test_002-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_002()/4 +location: clients/tests/test-client.py:590:test_002()/4 cmd: $NMCLI -f all d lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-005.expected b/clients/tests/test-client.check-on-disk/test_002-005.expected index 25b954c33c..61ab08cec5 100644 --- a/clients/tests/test-client.check-on-disk/test_002-005.expected +++ b/clients/tests/test-client.check-on-disk/test_002-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_002()/5 +location: clients/tests/test-client.py:590:test_002()/5 cmd: $NMCLI -f all d lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected index 46f92e87fc..b281b17154 100644 --- a/clients/tests/test-client.check-on-disk/test_002-006.expected +++ b/clients/tests/test-client.check-on-disk/test_002-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:577:test_002()/6 +location: clients/tests/test-client.py:590:test_002()/6 cmd: $NMCLI -f all d lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected index 821c1b1858..d7598ec01f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-007.expected +++ b/clients/tests/test-client.check-on-disk/test_002-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_002()/7 +location: clients/tests/test-client.py:592:test_002()/7 cmd: $NMCLI lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected index 23f3d8563f..8e40b1edef 100644 --- a/clients/tests/test-client.check-on-disk/test_002-008.expected +++ b/clients/tests/test-client.check-on-disk/test_002-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_002()/8 +location: clients/tests/test-client.py:592:test_002()/8 cmd: $NMCLI lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected index 065147a702..57033e7d1b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-009.expected +++ b/clients/tests/test-client.check-on-disk/test_002-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:579:test_002()/9 +location: clients/tests/test-client.py:592:test_002()/9 cmd: $NMCLI lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected index 6edba3afd2..c0bc99a4e6 100644 --- a/clients/tests/test-client.check-on-disk/test_002-010.expected +++ b/clients/tests/test-client.check-on-disk/test_002-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:581:test_002()/10 +location: clients/tests/test-client.py:594:test_002()/10 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected index 60b450f833..28e715966c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-011.expected +++ b/clients/tests/test-client.check-on-disk/test_002-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:581:test_002()/11 +location: clients/tests/test-client.py:594:test_002()/11 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected index cf151638f7..3e2d024cb7 100644 --- a/clients/tests/test-client.check-on-disk/test_002-012.expected +++ b/clients/tests/test-client.check-on-disk/test_002-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:581:test_002()/12 +location: clients/tests/test-client.py:594:test_002()/12 cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected index 60879e2c5d..08f4acf135 100644 --- a/clients/tests/test-client.check-on-disk/test_002-013.expected +++ b/clients/tests/test-client.check-on-disk/test_002-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:582:test_002()/13 +location: clients/tests/test-client.py:595:test_002()/13 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected index c78b7ac650..76fac3ebc9 100644 --- a/clients/tests/test-client.check-on-disk/test_002-014.expected +++ b/clients/tests/test-client.check-on-disk/test_002-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:582:test_002()/14 +location: clients/tests/test-client.py:595:test_002()/14 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected index 5c54169ee8..188ae07862 100644 --- a/clients/tests/test-client.check-on-disk/test_002-015.expected +++ b/clients/tests/test-client.check-on-disk/test_002-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:582:test_002()/15 +location: clients/tests/test-client.py:595:test_002()/15 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected index c7df39be02..62221b8d18 100644 --- a/clients/tests/test-client.check-on-disk/test_002-016.expected +++ b/clients/tests/test-client.check-on-disk/test_002-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:583:test_002()/16 +location: clients/tests/test-client.py:596:test_002()/16 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected index 8d09ae7f6a..745686134e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-017.expected +++ b/clients/tests/test-client.check-on-disk/test_002-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:583:test_002()/17 +location: clients/tests/test-client.py:596:test_002()/17 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected index 23d3cd2362..06f513df9b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-018.expected +++ b/clients/tests/test-client.check-on-disk/test_002-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:583:test_002()/18 +location: clients/tests/test-client.py:596:test_002()/18 cmd: $NMCLI -f AP -mode multiline -t d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected index c0aff64f6d..65518c8f12 100644 --- a/clients/tests/test-client.check-on-disk/test_002-019.expected +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:584:test_002()/19 +location: clients/tests/test-client.py:597:test_002()/19 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected index b9f9825f1e..89a85ee535 100644 --- a/clients/tests/test-client.check-on-disk/test_002-020.expected +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:584:test_002()/20 +location: clients/tests/test-client.py:597:test_002()/20 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected index 20fd56fb29..d0a9ec630a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-021.expected +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:584:test_002()/21 +location: clients/tests/test-client.py:597:test_002()/21 cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected index 33e04d1905..9c86c66c07 100644 --- a/clients/tests/test-client.check-on-disk/test_002-022.expected +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:585:test_002()/22 +location: clients/tests/test-client.py:598:test_002()/22 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected index 115ce69c43..63a6400e0c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-023.expected +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:585:test_002()/23 +location: clients/tests/test-client.py:598:test_002()/23 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected index 84f11a4a90..a7cfb4a95d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-024.expected +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:585:test_002()/24 +location: clients/tests/test-client.py:598:test_002()/24 cmd: $NMCLI -f AP -mode tabular -p d show wlan0 lang: de_DE.utf8 returncode: 0 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 index 9d007d6a1a..e639b9b868 100644 --- a/clients/tests/test-client.check-on-disk/test_002-025.expected +++ b/clients/tests/test-client.check-on-disk/test_002-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:586:test_002()/25 +location: clients/tests/test-client.py:599:test_002()/25 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-026.expected b/clients/tests/test-client.check-on-disk/test_002-026.expected index f4fb3ee11b..68c75f6fde 100644 --- a/clients/tests/test-client.check-on-disk/test_002-026.expected +++ b/clients/tests/test-client.check-on-disk/test_002-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:586:test_002()/26 +location: clients/tests/test-client.py:599:test_002()/26 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-027.expected b/clients/tests/test-client.check-on-disk/test_002-027.expected index e1cbb8d684..ca2f621e3c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-027.expected +++ b/clients/tests/test-client.check-on-disk/test_002-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:586:test_002()/27 +location: clients/tests/test-client.py:599:test_002()/27 cmd: $NMCLI -f AP -mode tabular -t d show wlan0 lang: de_DE.utf8 returncode: 0 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 index 776f9b9ee9..0d8cfbb8da 100644 --- a/clients/tests/test-client.check-on-disk/test_002-028.expected +++ b/clients/tests/test-client.check-on-disk/test_002-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:588:test_002()/28 +location: clients/tests/test-client.py:601:test_002()/28 cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 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 index 52e1a83581..c15c545707 100644 --- a/clients/tests/test-client.check-on-disk/test_002-029.expected +++ b/clients/tests/test-client.check-on-disk/test_002-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:588:test_002()/29 +location: clients/tests/test-client.py:601:test_002()/29 cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_002-030.expected b/clients/tests/test-client.check-on-disk/test_002-030.expected index 9ac49f07dd..ab41cd8db4 100644 --- a/clients/tests/test-client.check-on-disk/test_002-030.expected +++ b/clients/tests/test-client.check-on-disk/test_002-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:588:test_002()/30 +location: clients/tests/test-client.py:601:test_002()/30 cmd: $NMCLI -f ALL d wifi lang: de_DE.utf8 returncode: 0 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 index 75d1a7d90b..b11ee85440 100644 --- a/clients/tests/test-client.check-on-disk/test_002-031.expected +++ b/clients/tests/test-client.check-on-disk/test_002-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:590:test_002()/31 +location: clients/tests/test-client.py:603:test_002()/31 cmd: $NMCLI c lang: C returncode: 0 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 index caf7e395a2..1e752168c4 100644 --- a/clients/tests/test-client.check-on-disk/test_002-032.expected +++ b/clients/tests/test-client.check-on-disk/test_002-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:590:test_002()/32 +location: clients/tests/test-client.py:603:test_002()/32 cmd: $NMCLI c lang: pl_PL.UTF-8 returncode: 0 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 index 51f828dfbf..85d97e904d 100644 --- a/clients/tests/test-client.check-on-disk/test_002-033.expected +++ b/clients/tests/test-client.check-on-disk/test_002-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:590:test_002()/33 +location: clients/tests/test-client.py:603:test_002()/33 cmd: $NMCLI c lang: de_DE.utf8 returncode: 0 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 index 50d713d0d1..613da4c4bc 100644 --- a/clients/tests/test-client.check-on-disk/test_002-034.expected +++ b/clients/tests/test-client.check-on-disk/test_002-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:592:test_002()/34 +location: clients/tests/test-client.py:605:test_002()/34 cmd: $NMCLI c s con-1 lang: C returncode: 0 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 index 8c84e56893..a7c2a0fb57 100644 --- a/clients/tests/test-client.check-on-disk/test_002-035.expected +++ b/clients/tests/test-client.check-on-disk/test_002-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:592:test_002()/35 +location: clients/tests/test-client.py:605:test_002()/35 cmd: $NMCLI c s con-1 lang: pl_PL.UTF-8 returncode: 0 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 index 5ed52474ab..3cc781ec9c 100644 --- a/clients/tests/test-client.check-on-disk/test_002-036.expected +++ b/clients/tests/test-client.check-on-disk/test_002-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:592:test_002()/36 +location: clients/tests/test-client.py:605:test_002()/36 cmd: $NMCLI c s con-1 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-001.expected b/clients/tests/test-client.check-on-disk/test_003-001.expected index d4d4fb8419..6bcce4e234 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:602:test_003()/1 +location: clients/tests/test-client.py:615: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 1d7edd992e..22eac1c1c6 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:605:test_003()/2 +location: clients/tests/test-client.py:618: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 4d2ca109e7..98520d9e2c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-003.expected +++ b/clients/tests/test-client.check-on-disk/test_003-003.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:605:test_003()/3 +location: clients/tests/test-client.py:618:test_003()/3 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected index 079dbc7f85..3b533be8fa 100644 --- a/clients/tests/test-client.check-on-disk/test_003-004.expected +++ b/clients/tests/test-client.check-on-disk/test_003-004.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:605:test_003()/4 +location: clients/tests/test-client.py:618:test_003()/4 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-005.expected b/clients/tests/test-client.check-on-disk/test_003-005.expected index 7035c3e949..db3aa0a8f9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-005.expected +++ b/clients/tests/test-client.check-on-disk/test_003-005.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:610:test_003()/5 +location: clients/tests/test-client.py:623:test_003()/5 cmd: $NMCLI c add type ethernet ifname '*' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-006.expected b/clients/tests/test-client.check-on-disk/test_003-006.expected index 01960ad8d1..919b6417a4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-006.expected +++ b/clients/tests/test-client.check-on-disk/test_003-006.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:613:test_003()/6 +location: clients/tests/test-client.py:626:test_003()/6 cmd: $NMCLI c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-007.expected b/clients/tests/test-client.check-on-disk/test_003-007.expected index 867738c96d..08bf7e4c61 100644 --- a/clients/tests/test-client.check-on-disk/test_003-007.expected +++ b/clients/tests/test-client.check-on-disk/test_003-007.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:613:test_003()/7 +location: clients/tests/test-client.py:626:test_003()/7 cmd: $NMCLI c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected index e72450eab5..1b37ecc6fc 100644 --- a/clients/tests/test-client.check-on-disk/test_003-008.expected +++ b/clients/tests/test-client.check-on-disk/test_003-008.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:613:test_003()/8 +location: clients/tests/test-client.py:626:test_003()/8 cmd: $NMCLI c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected index 6edd4b00a0..e5c73d06e9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-009.expected +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:616:test_003()/9 +location: clients/tests/test-client.py:629:test_003()/9 cmd: $NMCLI -f ALL c s lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected index 0698d3a9dd..3777114226 100644 --- a/clients/tests/test-client.check-on-disk/test_003-010.expected +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:616:test_003()/10 +location: clients/tests/test-client.py:629:test_003()/10 cmd: $NMCLI -f ALL c s lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected index f89b14b824..7d2b477d0f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-011.expected +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:616:test_003()/11 +location: clients/tests/test-client.py:629:test_003()/11 cmd: $NMCLI -f ALL c s lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-012.expected b/clients/tests/test-client.check-on-disk/test_003-012.expected index 407742902c..b2c86ffec9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-012.expected +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:620:test_003()/12 +location: clients/tests/test-client.py:633:test_003()/12 cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected index a8fbb9ff10..1653c57331 100644 --- a/clients/tests/test-client.check-on-disk/test_003-013.expected +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:620:test_003()/13 +location: clients/tests/test-client.py:633:test_003()/13 cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected index 6708eb38d0..8c7b049404 100644 --- a/clients/tests/test-client.check-on-disk/test_003-014.expected +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:620:test_003()/14 +location: clients/tests/test-client.py:633:test_003()/14 cmd: $NMCLI --complete-args -f ALL c s '' lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected index a257841958..c66ee7e031 100644 --- a/clients/tests/test-client.check-on-disk/test_003-015.expected +++ b/clients/tests/test-client.check-on-disk/test_003-015.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:633:test_003()/15 +location: clients/tests/test-client.py:646:test_003()/15 cmd: $NMCLI con up ethernet ifname eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected index 2cadf2c710..117e7e2003 100644 --- a/clients/tests/test-client.check-on-disk/test_003-016.expected +++ b/clients/tests/test-client.check-on-disk/test_003-016.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:636:test_003()/16 +location: clients/tests/test-client.py:649:test_003()/16 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected index 9dc45ff69f..2798b9067f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-017.expected +++ b/clients/tests/test-client.check-on-disk/test_003-017.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:636:test_003()/17 +location: clients/tests/test-client.py:649:test_003()/17 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected index d4f3ab9f17..64a96d8b81 100644 --- a/clients/tests/test-client.check-on-disk/test_003-018.expected +++ b/clients/tests/test-client.check-on-disk/test_003-018.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:636:test_003()/18 +location: clients/tests/test-client.py:649:test_003()/18 cmd: $NMCLI con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected index 0cd1711c89..fce3cecaa0 100644 --- a/clients/tests/test-client.check-on-disk/test_003-019.expected +++ b/clients/tests/test-client.check-on-disk/test_003-019.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:639:test_003()/19 +location: clients/tests/test-client.py:652:test_003()/19 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected index 47e8ceba31..8bc9384c9f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-020.expected +++ b/clients/tests/test-client.check-on-disk/test_003-020.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:639:test_003()/20 +location: clients/tests/test-client.py:652:test_003()/20 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected index 704ceb599a..5d187a7255 100644 --- a/clients/tests/test-client.check-on-disk/test_003-021.expected +++ b/clients/tests/test-client.check-on-disk/test_003-021.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:639:test_003()/21 +location: clients/tests/test-client.py:652:test_003()/21 cmd: $NMCLI -f ALL con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected index 513dc8a1ae..5ec947a0eb 100644 --- a/clients/tests/test-client.check-on-disk/test_003-022.expected +++ b/clients/tests/test-client.check-on-disk/test_003-022.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:642:test_003()/22 +location: clients/tests/test-client.py:655:test_003()/22 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected index a188ae8461..21edcf4aaa 100644 --- a/clients/tests/test-client.check-on-disk/test_003-023.expected +++ b/clients/tests/test-client.check-on-disk/test_003-023.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:642:test_003()/23 +location: clients/tests/test-client.py:655:test_003()/23 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected index fb2f4b6891..4eb33a6eaa 100644 --- a/clients/tests/test-client.check-on-disk/test_003-024.expected +++ b/clients/tests/test-client.check-on-disk/test_003-024.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:642:test_003()/24 +location: clients/tests/test-client.py:655:test_003()/24 cmd: $NMCLI -f ALL con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected index 8aedcaf974..2bc2d53973 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:645:test_003()/25 +location: clients/tests/test-client.py:658:test_003()/25 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected index b299c60f87..ae8e64ae0e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:645:test_003()/26 +location: clients/tests/test-client.py:658:test_003()/26 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected index 1219d2034b..6a0e3863cd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:645:test_003()/27 +location: clients/tests/test-client.py:658:test_003()/27 cmd: $NMCLI con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected index 8162c99432..1ab559b12b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:648:test_003()/28 +location: clients/tests/test-client.py:661:test_003()/28 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected index 6e7e0a50a5..2d69684307 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:648:test_003()/29 +location: clients/tests/test-client.py:661:test_003()/29 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index 0ab4cb68ac..4cbe1eed4f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:648:test_003()/30 +location: clients/tests/test-client.py:661:test_003()/30 cmd: $NMCLI -f ALL dev s eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index 04035d2c9e..6fdb94cb5f 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:651:test_003()/31 +location: clients/tests/test-client.py:664:test_003()/31 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected index 53304af3dd..d5115e30eb 100644 --- a/clients/tests/test-client.check-on-disk/test_003-032.expected +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:651:test_003()/32 +location: clients/tests/test-client.py:664:test_003()/32 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected index b2c0e334c9..f53bd92277 100644 --- a/clients/tests/test-client.check-on-disk/test_003-033.expected +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:651:test_003()/33 +location: clients/tests/test-client.py:664:test_003()/33 cmd: $NMCLI -f ALL dev show eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected index 596ad5c3a8..144c0653d4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-034.expected +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:633:test_003()/34 +location: clients/tests/test-client.py:646:test_003()/34 cmd: $NMCLI con up ethernet ifname eth1 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected index 419d6360d7..d5a69fc185 100644 --- a/clients/tests/test-client.check-on-disk/test_003-035.expected +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:636:test_003()/35 +location: clients/tests/test-client.py:649:test_003()/35 cmd: $NMCLI con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected index e62faecc60..3ad180f969 100644 --- a/clients/tests/test-client.check-on-disk/test_003-036.expected +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:636:test_003()/36 +location: clients/tests/test-client.py:649:test_003()/36 cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected index a234a7e605..e795d67ff9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-037.expected +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:636:test_003()/37 +location: clients/tests/test-client.py:649:test_003()/37 cmd: $NMCLI con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected index 3b84da32e0..1e49e990cd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-038.expected +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:639:test_003()/38 +location: clients/tests/test-client.py:652:test_003()/38 cmd: $NMCLI -f ALL con lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected index acb1721d0b..59d2e9d16d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-039.expected +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:639:test_003()/39 +location: clients/tests/test-client.py:652:test_003()/39 cmd: $NMCLI -f ALL con lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected index df96e49929..7599373047 100644 --- a/clients/tests/test-client.check-on-disk/test_003-040.expected +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:639:test_003()/40 +location: clients/tests/test-client.py:652:test_003()/40 cmd: $NMCLI -f ALL con lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected index b0fb5cf4ef..f00861e0cf 100644 --- a/clients/tests/test-client.check-on-disk/test_003-041.expected +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:642:test_003()/41 +location: clients/tests/test-client.py:655:test_003()/41 cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected index a26f7a400a..8d27461363 100644 --- a/clients/tests/test-client.check-on-disk/test_003-042.expected +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:642:test_003()/42 +location: clients/tests/test-client.py:655:test_003()/42 cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected index e9f3d63879..6509f3599b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-043.expected +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:642:test_003()/43 +location: clients/tests/test-client.py:655:test_003()/43 cmd: $NMCLI -f ALL con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected index 9e97da426c..e6f4a9fc30 100644 --- a/clients/tests/test-client.check-on-disk/test_003-044.expected +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:645:test_003()/44 +location: clients/tests/test-client.py:658:test_003()/44 cmd: $NMCLI con s ethernet lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected index ae5d163ef4..3d75dc2161 100644 --- a/clients/tests/test-client.check-on-disk/test_003-045.expected +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:645:test_003()/45 +location: clients/tests/test-client.py:658:test_003()/45 cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected index f78eb84cad..526c2517e3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-046.expected +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:645:test_003()/46 +location: clients/tests/test-client.py:658:test_003()/46 cmd: $NMCLI con s ethernet lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected index eaddf1102b..bbb04d5299 100644 --- a/clients/tests/test-client.check-on-disk/test_003-047.expected +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:648:test_003()/47 +location: clients/tests/test-client.py:661:test_003()/47 cmd: $NMCLI -f ALL dev s eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected index 863bc01e25..aa360ef1c7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-048.expected +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:648:test_003()/48 +location: clients/tests/test-client.py:661:test_003()/48 cmd: $NMCLI -f ALL dev s eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected index dd52b8fded..736d4421fd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-049.expected +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:648:test_003()/49 +location: clients/tests/test-client.py:661:test_003()/49 cmd: $NMCLI -f ALL dev s eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected index b300891387..be2ccb1e64 100644 --- a/clients/tests/test-client.check-on-disk/test_003-050.expected +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:651:test_003()/50 +location: clients/tests/test-client.py:664:test_003()/50 cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected index c1fd9e1d34..7335505190 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:651:test_003()/51 +location: clients/tests/test-client.py:664:test_003()/51 cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected index 2e3eb15194..ef0b775740 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -1,4 +1,4 @@ -location: clients/tests/test-client.py:651:test_003()/52 +location: clients/tests/test-client.py:664:test_003()/52 cmd: $NMCLI -f ALL dev show eth0 lang: de_DE.utf8 returncode: 0 diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 8197d80c4f..7e37da234b 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -3,6 +3,17 @@ from __future__ import print_function import sys + +try: + import gi + from gi.repository import GLib + + gi.require_version('NM', '1.0') + from gi.repository import NM +except Exception as e: + GLib = None + NM = None + import os import errno import unittest @@ -507,6 +518,8 @@ class TestNmcli(NmTestBase): def setUp(self): if not dbus_session_inited: self.skipTest("Own D-Bus session for testing is not initialized. Do you have dbus-run-session available?") + if NM is None: + self.skipTest("gi.NM is not available. Did you build with introspection?") self.srv = NMStubServer() self._calling_num = {} self._skip_test_for_l10n_diff = [] From 2cae37ca40886c8edaf524406ad61ab1b92aff3d Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 16:39:43 +0200 Subject: [PATCH 7/8] clients/tests: test nmcli output for active-connection state DEACTIVATING --- Makefile.am | 27 ++++ .../test_003-053.expected | 16 +++ .../test_003-054.expected | 16 +++ .../test_003-055.expected | 16 +++ .../test_003-056.expected | 16 +++ .../test_003-057.expected | 16 +++ .../test_003-058.expected | 16 +++ .../test_003-059.expected | 18 +++ .../test_003-060.expected | 18 +++ .../test_003-061.expected | 18 +++ .../test_003-062.expected | 18 +++ .../test_003-063.expected | 18 +++ .../test_003-064.expected | 18 +++ .../test_003-065.expected | 24 ++++ .../test_003-066.expected | 24 ++++ .../test_003-067.expected | 24 ++++ .../test_003-068.expected | 16 +++ .../test_003-069.expected | 16 +++ .../test_003-070.expected | 16 +++ .../test_003-071.expected | 15 +++ .../test_003-072.expected | 15 +++ .../test_003-073.expected | 15 +++ .../test_003-074.expected | 20 +++ .../test_003-075.expected | 20 +++ .../test_003-076.expected | 20 +++ .../test_003-077.expected | 115 ++++++++++++++++++ .../test_003-078.expected | 115 ++++++++++++++++++ .../test_003-079.expected | 115 ++++++++++++++++++ clients/tests/test-client.py | 32 +++++ 29 files changed, 833 insertions(+) create mode 100644 clients/tests/test-client.check-on-disk/test_003-053.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-054.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-055.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-056.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-057.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-058.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-059.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-060.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-061.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-062.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-063.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-064.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-065.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-066.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-067.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-068.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-069.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-070.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-071.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-072.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-073.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-074.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-075.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-076.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-077.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-078.expected create mode 100644 clients/tests/test-client.check-on-disk/test_003-079.expected diff --git a/Makefile.am b/Makefile.am index c4430e208f..58f87e40bc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3907,6 +3907,33 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_003-050.expected \ clients/tests/test-client.check-on-disk/test_003-051.expected \ clients/tests/test-client.check-on-disk/test_003-052.expected \ + clients/tests/test-client.check-on-disk/test_003-053.expected \ + clients/tests/test-client.check-on-disk/test_003-054.expected \ + clients/tests/test-client.check-on-disk/test_003-055.expected \ + clients/tests/test-client.check-on-disk/test_003-056.expected \ + clients/tests/test-client.check-on-disk/test_003-057.expected \ + clients/tests/test-client.check-on-disk/test_003-058.expected \ + clients/tests/test-client.check-on-disk/test_003-059.expected \ + clients/tests/test-client.check-on-disk/test_003-060.expected \ + clients/tests/test-client.check-on-disk/test_003-061.expected \ + clients/tests/test-client.check-on-disk/test_003-062.expected \ + clients/tests/test-client.check-on-disk/test_003-063.expected \ + clients/tests/test-client.check-on-disk/test_003-064.expected \ + clients/tests/test-client.check-on-disk/test_003-065.expected \ + clients/tests/test-client.check-on-disk/test_003-066.expected \ + clients/tests/test-client.check-on-disk/test_003-067.expected \ + clients/tests/test-client.check-on-disk/test_003-068.expected \ + clients/tests/test-client.check-on-disk/test_003-069.expected \ + clients/tests/test-client.check-on-disk/test_003-070.expected \ + clients/tests/test-client.check-on-disk/test_003-071.expected \ + clients/tests/test-client.check-on-disk/test_003-072.expected \ + clients/tests/test-client.check-on-disk/test_003-073.expected \ + clients/tests/test-client.check-on-disk/test_003-074.expected \ + clients/tests/test-client.check-on-disk/test_003-075.expected \ + clients/tests/test-client.check-on-disk/test_003-076.expected \ + clients/tests/test-client.check-on-disk/test_003-077.expected \ + clients/tests/test-client.check-on-disk/test_003-078.expected \ + clients/tests/test-client.check-on-disk/test_003-079.expected \ \ $(NULL) diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected new file mode 100644 index 0000000000..29e9244712 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-053.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:671:test_003()/53 +cmd: $NMCLI -f ALL con +lang: C +returncode: 0 +stdout: 1096 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected new file mode 100644 index 0000000000..9e8aefe3d9 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-054.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:671:test_003()/54 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 1104 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected new file mode 100644 index 0000000000..d0389db709 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-055.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:671:test_003()/55 +cmd: $NMCLI -f ALL con +lang: de_DE.utf8 +returncode: 0 +stdout: 1112 bytes +>>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 ja eth0 wird deaktiviert /org/freedesktop/NetworkManager/ActiveConnection/1 -- +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 -- -- -- -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected new file mode 100644 index 0000000000..647867b9c2 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-056.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:674:test_003()/56 +cmd: $NMCLI -f UUID,TYPE con +lang: C +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-057.expected b/clients/tests/test-client.check-on-disk/test_003-057.expected new file mode 100644 index 0000000000..c9825577a5 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-057.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:674:test_003()/57 +cmd: $NMCLI -f UUID,TYPE con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-058.expected b/clients/tests/test-client.check-on-disk/test_003-058.expected new file mode 100644 index 0000000000..3ae660befb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-058.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:674:test_003()/58 +cmd: $NMCLI -f UUID,TYPE con +lang: de_DE.utf8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-059.expected b/clients/tests/test-client.check-on-disk/test_003-059.expected new file mode 100644 index 0000000000..d0eb8fd021 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-059.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:677:test_003()/59 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: C +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-060.expected b/clients/tests/test-client.check-on-disk/test_003-060.expected new file mode 100644 index 0000000000..428b5352a7 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-060.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:677:test_003()/60 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-061.expected b/clients/tests/test-client.check-on-disk/test_003-061.expected new file mode 100644 index 0000000000..d83c21b6be --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-061.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:677:test_003()/61 +cmd: $NMCLI -f UUID,TYPE --mode multiline con +lang: de_DE.utf8 +returncode: 0 +stdout: 378 bytes +>>> +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected new file mode 100644 index 0000000000..6df46f6171 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-062.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:680:test_003()/62 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: C +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected new file mode 100644 index 0000000000..068fab1f5b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-063.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:680:test_003()/63 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected new file mode 100644 index 0000000000..054e6619cf --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-064.expected @@ -0,0 +1,18 @@ +location: clients/tests/test-client.py:680:test_003()/64 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: de_DE.utf8 +returncode: 0 +stdout: 186 bytes +>>> +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected new file mode 100644 index 0000000000..a7d991d858 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-065.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:683:test_003()/65 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: C +returncode: 0 +stdout: 835 bytes +>>> +=============================================================================== + NetworkManager connection profiles +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected new file mode 100644 index 0000000000..fd53d66711 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-066.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:683:test_003()/66 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 841 bytes +>>> +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected new file mode 100644 index 0000000000..d22b8582d4 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-067.expected @@ -0,0 +1,24 @@ +location: clients/tests/test-client.py:683:test_003()/67 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: de_DE.utf8 +returncode: 0 +stdout: 835 bytes +>>> +=============================================================================== + NetworkManager Verbindungsprofile +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected new file mode 100644 index 0000000000..2e303c963b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-068.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:686:test_003()/68 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: C +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected new file mode 100644 index 0000000000..9f637a8c63 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-069.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:686:test_003()/69 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected new file mode 100644 index 0000000000..3ca3df604b --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-070.expected @@ -0,0 +1,16 @@ +location: clients/tests/test-client.py:686:test_003()/70 +cmd: $NMCLI -f UUID,TYPE --mode tabular con +lang: de_DE.utf8 +returncode: 0 +stdout: 192 bytes +>>> +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected new file mode 100644 index 0000000000..894b8fb1fb --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-071.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:689:test_003()/71 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: C +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected new file mode 100644 index 0000000000..63fb19a8e1 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-072.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:689:test_003()/72 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected new file mode 100644 index 0000000000..baa537e956 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-073.expected @@ -0,0 +1,15 @@ +location: clients/tests/test-client.py:689:test_003()/73 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: de_DE.utf8 +returncode: 0 +stdout: 156 bytes +>>> +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-074.expected b/clients/tests/test-client.check-on-disk/test_003-074.expected new file mode 100644 index 0000000000..79b5361f8a --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-074.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:692:test_003()/74 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: C +returncode: 0 +stdout: 394 bytes +>>> +====================================== + NetworkManager connection profiles +====================================== +UUID TYPE +-------------------------------------------------------------------------------------- +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected new file mode 100644 index 0000000000..b04e475532 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-075.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:692:test_003()/75 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 414 bytes +>>> +========================================== + Profile połączeń usługi NetworkManager +========================================== +UUID TYPE +------------------------------------------------------------------------------------------ +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected new file mode 100644 index 0000000000..be70034612 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-076.expected @@ -0,0 +1,20 @@ +location: clients/tests/test-client.py:692:test_003()/76 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: de_DE.utf8 +returncode: 0 +stdout: 390 bytes +>>> +===================================== + NetworkManager Verbindungsprofile +===================================== +UUID TYPE +------------------------------------------------------------------------------------- +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected new file mode 100644 index 0000000000..6b0213b491 --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-077.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:695:test_003()/77 +cmd: $NMCLI con s ethernet +lang: C +returncode: 0 +stdout: 4848 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected new file mode 100644 index 0000000000..d8df8f8cef --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-078.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:695:test_003()/78 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 4872 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected new file mode 100644 index 0000000000..a73b5f810d --- /dev/null +++ b/clients/tests/test-client.check-on-disk/test_003-079.expected @@ -0,0 +1,115 @@ +location: clients/tests/test-client.py:695:test_003()/79 +cmd: $NMCLI con s ethernet +lang: de_DE.utf8 +returncode: 0 +stdout: 4875 bytes +>>> +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +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) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nein +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nein +ipv4.ignore-auto-dns: nein +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: ja +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nein +ipv4.may-fail: ja +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nein +ipv6.ignore-auto-dns: nein +ipv6.never-default: nein +ipv6.may-fail: ja +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: ja +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nein +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: nein +GENERAL.DEFAULT6: nein +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nein +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: nein +GENERAL.DEFAULT6: nein +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nein +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +<<< +stderr: 0 bytes +>>> + +<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index 7e37da234b..a64d678825 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -663,6 +663,38 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(['-f', 'ALL', 'dev', 'show', 'eth0'], replace_stdout = replace_stdout) + self.srv.setProperty('/org/freedesktop/NetworkManager/ActiveConnection/1', + 'State', + dbus.UInt32(NM.ActiveConnectionState.DEACTIVATING)) + + self.call_nmcli_l(['-f', 'ALL', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--terse', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'multiline', '--pretty', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--terse', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['-f', 'UUID,TYPE', '--mode', 'tabular', '--pretty', 'con'], + replace_stdout = replace_stdout) + + self.call_nmcli_l(['con', 's', 'ethernet'], + replace_stdout = replace_stdout) + + ############################################################################### def main(): From 41dbf2b9d36d5eae53a594180d5334c134cbe18c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 17:12:58 +0200 Subject: [PATCH 8/8] clients/tests: drop duplicate tests for German translation call_nmcli_l() would test for 3 languages: 'C', 'de', and 'pl'. There is no fundamental difference between 'de' and 'pl', so there is no need to test for two languages. --- Makefile.am | 41 ------ .../test_001-003.expected | 27 ++-- .../test_001-004.expected | 6 +- .../test_001-005.expected | 20 +-- .../test_001-006.expected | 20 +-- .../test_001-007.expected | 18 +-- .../test_001-008.expected | 18 +-- .../test_001-009.expected | 13 -- .../test_001-010.expected | 13 -- .../test_001-011.expected | 13 -- .../test_001-012.expected | 13 -- .../test_002-003.expected | 20 +-- .../test_002-004.expected | 14 +- .../test_002-005.expected | 41 ++++-- .../test_002-006.expected | 43 ++++-- .../test_002-007.expected | 57 ++++--- .../test_002-008.expected | 59 ++++---- .../test_002-009.expected | 66 +++++---- .../test_002-010.expected | 26 ++-- .../test_002-011.expected | 56 +++---- .../test_002-012.expected | 56 +++---- .../test_002-013.expected | 40 +---- .../test_002-014.expected | 40 +---- .../test_002-015.expected | 46 ++---- .../test_002-016.expected | 40 ++--- .../test_002-017.expected | 35 +---- .../test_002-018.expected | 35 +---- .../test_002-019.expected | 19 ++- .../test_002-020.expected | 19 ++- .../test_002-021.expected | 14 +- .../test_002-022.expected | 18 +-- .../test_002-023.expected | 37 +++-- .../test_002-024.expected | 37 +++-- .../test_002-025.expected | 15 -- .../test_002-026.expected | 15 -- .../test_002-027.expected | 15 -- .../test_002-028.expected | 21 --- .../test_002-029.expected | 21 --- .../test_002-030.expected | 21 --- .../test_002-031.expected | 14 -- .../test_002-032.expected | 14 -- .../test_002-033.expected | 14 -- .../test_002-034.expected | 33 ----- .../test_002-035.expected | 33 ----- .../test_002-036.expected | 33 ----- .../test_003-004.expected | 12 +- .../test_003-005.expected | 11 +- .../test_003-006.expected | 2 +- .../test_003-007.expected | 16 +- .../test_003-008.expected | 16 +- .../test_003-009.expected | 20 ++- .../test_003-010.expected | 20 ++- .../test_003-011.expected | 13 +- .../test_003-012.expected | 20 +-- .../test_003-013.expected | 20 +-- .../test_003-014.expected | 22 +-- .../test_003-015.expected | 13 +- .../test_003-016.expected | 88 ++++++++++- .../test_003-017.expected | 88 ++++++++++- .../test_003-018.expected | 102 ++++++++++++- .../test_003-019.expected | 102 ++++++++++++- .../test_003-020.expected | 21 +-- .../test_003-021.expected | 21 +-- .../test_003-022.expected | 114 +++++--------- .../test_003-023.expected | 114 +++++--------- .../test_003-024.expected | 87 +---------- .../test_003-025.expected | 100 +------------ .../test_003-026.expected | 100 +------------ .../test_003-027.expected | 102 +------------ .../test_003-028.expected | 21 ++- .../test_003-029.expected | 95 ++++++++++-- .../test_003-030.expected | 95 ++++++++++-- .../test_003-031.expected | 139 +++++++++++++----- .../test_003-032.expected | 139 +++++++++++++----- .../test_003-033.expected | 47 ++---- .../test_003-034.expected | 18 ++- .../test_003-035.expected | 40 ++++- .../test_003-036.expected | 40 ++++- .../test_003-037.expected | 16 +- .../test_003-038.expected | 14 +- .../test_003-039.expected | 16 +- .../test_003-040.expected | 16 +- .../test_003-041.expected | 90 ++---------- .../test_003-042.expected | 90 ++---------- .../test_003-043.expected | 92 ++---------- .../test_003-044.expected | 117 ++------------- .../test_003-045.expected | 123 ++-------------- .../test_003-046.expected | 123 ++-------------- .../test_003-047.expected | 19 +-- .../test_003-048.expected | 19 +-- .../test_003-049.expected | 20 +-- .../test_003-050.expected | 41 +----- .../test_003-051.expected | 46 ++---- .../test_003-052.expected | 46 ++---- .../test_003-053.expected | 113 +++++++++++++- .../test_003-054.expected | 113 +++++++++++++- .../test_003-055.expected | 16 -- .../test_003-056.expected | 16 -- .../test_003-057.expected | 16 -- .../test_003-058.expected | 16 -- .../test_003-059.expected | 18 --- .../test_003-060.expected | 18 --- .../test_003-061.expected | 18 --- .../test_003-062.expected | 18 --- .../test_003-063.expected | 18 --- .../test_003-064.expected | 18 --- .../test_003-065.expected | 24 --- .../test_003-066.expected | 24 --- .../test_003-067.expected | 24 --- .../test_003-068.expected | 16 -- .../test_003-069.expected | 16 -- .../test_003-070.expected | 16 -- .../test_003-071.expected | 15 -- .../test_003-072.expected | 15 -- .../test_003-073.expected | 15 -- .../test_003-074.expected | 20 --- .../test_003-075.expected | 20 --- .../test_003-076.expected | 20 --- .../test_003-077.expected | 115 --------------- .../test_003-078.expected | 115 --------------- .../test_003-079.expected | 115 --------------- clients/tests/test-client.py | 2 +- 122 files changed, 1833 insertions(+), 3152 deletions(-) delete mode 100644 clients/tests/test-client.check-on-disk/test_001-009.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_001-010.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_001-011.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_001-012.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-025.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-026.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-027.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-028.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-029.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-030.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-031.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-032.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-033.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-034.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-035.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_002-036.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-055.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-056.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-057.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-058.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-059.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-060.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-061.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-062.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-063.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-064.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-065.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-066.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-067.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-068.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-069.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-070.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-071.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-072.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-073.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-074.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-075.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-076.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-077.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-078.expected delete mode 100644 clients/tests/test-client.check-on-disk/test_003-079.expected diff --git a/Makefile.am b/Makefile.am index 58f87e40bc..cffb524f5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3815,10 +3815,6 @@ EXTRA_DIST += \ 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 \ @@ -3843,18 +3839,6 @@ EXTRA_DIST += \ 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 \ @@ -3909,31 +3893,6 @@ EXTRA_DIST += \ clients/tests/test-client.check-on-disk/test_003-052.expected \ clients/tests/test-client.check-on-disk/test_003-053.expected \ clients/tests/test-client.check-on-disk/test_003-054.expected \ - clients/tests/test-client.check-on-disk/test_003-055.expected \ - clients/tests/test-client.check-on-disk/test_003-056.expected \ - clients/tests/test-client.check-on-disk/test_003-057.expected \ - clients/tests/test-client.check-on-disk/test_003-058.expected \ - clients/tests/test-client.check-on-disk/test_003-059.expected \ - clients/tests/test-client.check-on-disk/test_003-060.expected \ - clients/tests/test-client.check-on-disk/test_003-061.expected \ - clients/tests/test-client.check-on-disk/test_003-062.expected \ - clients/tests/test-client.check-on-disk/test_003-063.expected \ - clients/tests/test-client.check-on-disk/test_003-064.expected \ - clients/tests/test-client.check-on-disk/test_003-065.expected \ - clients/tests/test-client.check-on-disk/test_003-066.expected \ - clients/tests/test-client.check-on-disk/test_003-067.expected \ - clients/tests/test-client.check-on-disk/test_003-068.expected \ - clients/tests/test-client.check-on-disk/test_003-069.expected \ - clients/tests/test-client.check-on-disk/test_003-070.expected \ - clients/tests/test-client.check-on-disk/test_003-071.expected \ - clients/tests/test-client.check-on-disk/test_003-072.expected \ - clients/tests/test-client.check-on-disk/test_003-073.expected \ - clients/tests/test-client.check-on-disk/test_003-074.expected \ - clients/tests/test-client.check-on-disk/test_003-075.expected \ - clients/tests/test-client.check-on-disk/test_003-076.expected \ - clients/tests/test-client.check-on-disk/test_003-077.expected \ - clients/tests/test-client.check-on-disk/test_003-078.expected \ - clients/tests/test-client.check-on-disk/test_003-079.expected \ \ $(NULL) 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 2ddf350e6c..b98da49fe7 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,20 +1,13 @@ -location: clients/tests/test-client.py:577: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: 0 bytes +location: clients/tests/test-client.py:579:test_001()/3 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: C +returncode: 10 +stdout: 0 bytes >>> <<< +stderr: 33 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 8d34526cf4..4b38d92160 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:579:test_001()/4 cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: C +lang: pl_PL.UTF-8 returncode: 10 stdout: 0 bytes >>> <<< -stderr: 33 bytes +stderr: 49 bytes >>> -Error: Device 'wlan0' not found. +Błąd: Nie odnaleziono urządzenia „wlan0”. <<< 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 84b1bc6572..854fffa450 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:579:test_001()/5 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: pl_PL.UTF-8 -returncode: 10 -stdout: 0 bytes +location: clients/tests/test-client.py:581:test_001()/5 +cmd: $NMCLI c s +lang: C +returncode: 0 +stdout: 26 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 949c2297c0..6e65b2b00d 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:579:test_001()/6 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: de_DE.utf8 -returncode: 10 -stdout: 0 bytes +location: clients/tests/test-client.py:581:test_001()/6 +cmd: $NMCLI c s +lang: pl_PL.UTF-8 +returncode: 0 +stdout: 26 bytes +>>> +NAME UUID TYPE DEVICE + +<<< +stderr: 0 bytes >>> <<< -stderr: 47 bytes ->>> -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 index 0169df6a8e..2854fb8a74 100644 --- a/clients/tests/test-client.check-on-disk/test_001-007.expected +++ b/clients/tests/test-client.check-on-disk/test_001-007.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:581:test_001()/7 -cmd: $NMCLI c s +location: clients/tests/test-client.py:583:test_001()/7 +cmd: $NMCLI bogus s lang: C -returncode: 0 -stdout: 26 bytes ->>> -NAME UUID TYPE DEVICE - -<<< -stderr: 0 bytes +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-008.expected b/clients/tests/test-client.check-on-disk/test_001-008.expected index 284218b1e3..40a76d5f79 100644 --- a/clients/tests/test-client.check-on-disk/test_001-008.expected +++ b/clients/tests/test-client.check-on-disk/test_001-008.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:581:test_001()/8 -cmd: $NMCLI c s +location: clients/tests/test-client.py:583:test_001()/8 +cmd: $NMCLI bogus s lang: pl_PL.UTF-8 -returncode: 0 -stdout: 26 bytes ->>> -NAME UUID TYPE DEVICE - -<<< -stderr: 0 bytes +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-009.expected b/clients/tests/test-client.check-on-disk/test_001-009.expected deleted file mode 100644 index 4bb5543d13..0000000000 --- a/clients/tests/test-client.check-on-disk/test_001-009.expected +++ /dev/null @@ -1,13 +0,0 @@ -location: clients/tests/test-client.py:581: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 deleted file mode 100644 index b1fcaf2030..0000000000 --- a/clients/tests/test-client.check-on-disk/test_001-010.expected +++ /dev/null @@ -1,13 +0,0 @@ -location: clients/tests/test-client.py:583: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 deleted file mode 100644 index 5e045778ac..0000000000 --- a/clients/tests/test-client.check-on-disk/test_001-011.expected +++ /dev/null @@ -1,13 +0,0 @@ -location: clients/tests/test-client.py:583: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 deleted file mode 100644 index d8be06f7d2..0000000000 --- a/clients/tests/test-client.check-on-disk/test_001-012.expected +++ /dev/null @@ -1,13 +0,0 @@ -location: clients/tests/test-client.py:583: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-003.expected b/clients/tests/test-client.check-on-disk/test_002-003.expected index 30e21f760f..81392202d6 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,15 +1,15 @@ -location: clients/tests/test-client.py:588:test_002()/3 -cmd: $NMCLI d -lang: de_DE.utf8 +location: clients/tests/test-client.py:590:test_002()/3 +cmd: $NMCLI -f all d +lang: C returncode: 0 -stdout: 287 bytes +stdout: 636 bytes >>> -DEVICE TYPE STATE CONNECTION -eth0 ethernet nicht verfügbar -- -eth1 ethernet nicht verfügbar -- -wlan0 wifi nicht verfügbar -- -wlan1 wifi nicht verfügbar -- -wlan1 wifi nicht verfügbar -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 -- -- -- +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< 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 ad5317c1d3..d5c93d91db 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,15 +1,15 @@ location: clients/tests/test-client.py:590:test_002()/4 cmd: $NMCLI -f all d -lang: C +lang: pl_PL.UTF-8 returncode: 0 -stdout: 636 bytes +stdout: 641 bytes >>> DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 -- -- -- -eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 -- -- -- +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- <<< 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 61ab08cec5..3f4cc29238 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,15 +1,36 @@ -location: clients/tests/test-client.py:590:test_002()/5 -cmd: $NMCLI -f all d -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:592:test_002()/5 +cmd: $NMCLI +lang: C returncode: 0 -stdout: 641 bytes +stdout: 621 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 -- -- -- -eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0: unavailable + "eth0" + ethernet (virtual), 72:41:AB:90:41:5D, hw + +eth1: unavailable + "eth1" + ethernet (virtual), 1F:E6:D1:E6:1D:53, 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-006.expected b/clients/tests/test-client.check-on-disk/test_002-006.expected index b281b17154..0f745fdc3c 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,15 +1,38 @@ -location: clients/tests/test-client.py:590:test_002()/6 -cmd: $NMCLI -f all d -lang: de_DE.utf8 +location: clients/tests/test-client.py:592:test_002()/6 +cmd: $NMCLI +lang: pl_PL.UTF-8 returncode: 0 -stdout: 665 bytes +stdout: 684 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 -- -- -- -eth1 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0: niedostępne + "eth0" + ethernet (virtual), 72:41:AB:90:41:5D, sprzęt + +eth1: niedostępne + "eth1" + ethernet (virtual), 1F:E6:D1:E6:1D:53, 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-007.expected b/clients/tests/test-client.check-on-disk/test_002-007.expected index d7598ec01f..b1a743c125 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,36 +1,33 @@ -location: clients/tests/test-client.py:592:test_002()/7 -cmd: $NMCLI +location: clients/tests/test-client.py:594:test_002()/7 +cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: C returncode: 0 -stdout: 621 bytes +stdout: 1107 bytes >>> -eth0: unavailable - "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, hw - -eth1: unavailable - "eth1" - ethernet (virtual), 1F:E6:D1:E6:1D:53, 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. +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-008.expected b/clients/tests/test-client.check-on-disk/test_002-008.expected index 8e40b1edef..93c5565312 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,38 +1,33 @@ -location: clients/tests/test-client.py:592:test_002()/8 -cmd: $NMCLI +location: clients/tests/test-client.py:594:test_002()/8 +cmd: $NMCLI -f AP -mode multiline d show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 684 bytes +stdout: 1134 bytes >>> -eth0: niedostępne - "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, sprzęt - -eth1: niedostępne - "eth1" - ethernet (virtual), 1F:E6:D1:E6:1D:53, 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. +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-009.expected b/clients/tests/test-client.check-on-disk/test_002-009.expected index 57033e7d1b..5c583622b7 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,37 +1,39 @@ -location: clients/tests/test-client.py:592:test_002()/9 -cmd: $NMCLI -lang: de_DE.utf8 +location: clients/tests/test-client.py:595:test_002()/9 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: C returncode: 0 -stdout: 691 bytes +stdout: 1558 bytes >>> -eth0: nicht verfügbar - "eth0" - ethernet (virtual), 72:41:AB:90:41:5D, hw - -eth1: nicht verfügbar - "eth1" - ethernet (virtual), 1F:E6:D1:E6:1D:53, 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. +=============================================================================== + 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-010.expected b/clients/tests/test-client.check-on-disk/test_002-010.expected index c0bc99a4e6..7b6f604f3f 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,33 +1,39 @@ -location: clients/tests/test-client.py:594:test_002()/10 -cmd: $NMCLI -f AP -mode multiline d show wlan0 -lang: C +location: clients/tests/test-client.py:595:test_002()/10 +cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1107 bytes +stdout: 1592 bytes >>> +=============================================================================== + Informacje o urządzeniu (wlan0) +=============================================================================== AP[1].IN-USE: AP[1].SSID: wlan0-ap-3 -AP[1].MODE: Infra +AP[1].MODE: Infrastruktura AP[1].CHAN: 1 -AP[1].RATE: 54 Mbit/s +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: Infra +AP[2].MODE: Infrastruktura AP[2].CHAN: 1 -AP[2].RATE: 54 Mbit/s +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: Infra +AP[3].MODE: Infrastruktura AP[3].CHAN: 1 -AP[3].RATE: 54 Mbit/s +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-011.expected b/clients/tests/test-client.check-on-disk/test_002-011.expected index 28e715966c..4d82482108 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,33 +1,33 @@ -location: clients/tests/test-client.py:594:test_002()/11 -cmd: $NMCLI -f AP -mode multiline d show wlan0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:596:test_002()/11 +cmd: $NMCLI -f AP -mode multiline -t d show wlan0 +lang: C returncode: 0 -stdout: 1134 bytes +stdout: 435 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-012.expected b/clients/tests/test-client.check-on-disk/test_002-012.expected index 3e2d024cb7..3517a53e64 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:594:test_002()/12 -cmd: $NMCLI -f AP -mode multiline d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:596:test_002()/12 +cmd: $NMCLI -f AP -mode multiline -t d show wlan0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1107 bytes +stdout: 462 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 +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-013.expected b/clients/tests/test-client.check-on-disk/test_002-013.expected index 08f4acf135..d7a66f1b18 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,39 +1,13 @@ -location: clients/tests/test-client.py:595:test_002()/13 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +location: clients/tests/test-client.py:597:test_002()/13 +cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: C returncode: 0 -stdout: 1558 bytes +stdout: 304 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 -------------------------------------------------------------------------------- +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-014.expected b/clients/tests/test-client.check-on-disk/test_002-014.expected index 76fac3ebc9..c062eac5e0 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,39 +1,13 @@ -location: clients/tests/test-client.py:595:test_002()/14 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 +location: clients/tests/test-client.py:597:test_002()/14 +cmd: $NMCLI -f AP -mode tabular d show wlan0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 1592 bytes +stdout: 338 bytes >>> -=============================================================================== - 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 -------------------------------------------------------------------------------- +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-015.expected b/clients/tests/test-client.check-on-disk/test_002-015.expected index 188ae07862..6293c2b4cb 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,39 +1,17 @@ -location: clients/tests/test-client.py:595:test_002()/15 -cmd: $NMCLI -f AP -mode multiline -p d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:598:test_002()/15 +cmd: $NMCLI -f AP -mode tabular -p d show wlan0 +lang: C returncode: 0 -stdout: 1562 bytes +stdout: 460 bytes >>> -=============================================================================== - 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 -------------------------------------------------------------------------------- +========================== + 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-016.expected b/clients/tests/test-client.check-on-disk/test_002-016.expected index 62221b8d18..617ed9ae3a 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,33 +1,17 @@ -location: clients/tests/test-client.py:596:test_002()/16 -cmd: $NMCLI -f AP -mode multiline -t d show wlan0 -lang: C +location: clients/tests/test-client.py:598:test_002()/16 +cmd: $NMCLI -f AP -mode tabular -p d show wlan0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 435 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 +=================================== + 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-017.expected b/clients/tests/test-client.check-on-disk/test_002-017.expected index 745686134e..90e5053213 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,33 +1,12 @@ -location: clients/tests/test-client.py:596:test_002()/17 -cmd: $NMCLI -f AP -mode multiline -t d show wlan0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:599:test_002()/17 +cmd: $NMCLI -f AP -mode tabular -t d show wlan0 +lang: C returncode: 0 -stdout: 462 bytes +stdout: 165 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]: :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-018.expected b/clients/tests/test-client.check-on-disk/test_002-018.expected index 06f513df9b..f17d1ecd8f 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,33 +1,12 @@ -location: clients/tests/test-client.py:596:test_002()/18 -cmd: $NMCLI -f AP -mode multiline -t d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:599:test_002()/18 +cmd: $NMCLI -f AP -mode tabular -t d show wlan0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 435 bytes +stdout: 192 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 +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-019.expected b/clients/tests/test-client.check-on-disk/test_002-019.expected index 65518c8f12..263056988a 100644 --- a/clients/tests/test-client.check-on-disk/test_002-019.expected +++ b/clients/tests/test-client.check-on-disk/test_002-019.expected @@ -1,13 +1,18 @@ -location: clients/tests/test-client.py:597:test_002()/19 -cmd: $NMCLI -f AP -mode tabular d show wlan0 +location: clients/tests/test-client.py:601:test_002()/19 +cmd: $NMCLI -f ALL d wifi lang: C returncode: 0 -stdout: 304 bytes +stdout: 1840 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 +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-020.expected b/clients/tests/test-client.check-on-disk/test_002-020.expected index 89a85ee535..ff534ad05f 100644 --- a/clients/tests/test-client.check-on-disk/test_002-020.expected +++ b/clients/tests/test-client.check-on-disk/test_002-020.expected @@ -1,13 +1,18 @@ -location: clients/tests/test-client.py:597:test_002()/20 -cmd: $NMCLI -f AP -mode tabular d show wlan0 +location: clients/tests/test-client.py:601:test_002()/20 +cmd: $NMCLI -f ALL d wifi lang: pl_PL.UTF-8 returncode: 0 -stdout: 338 bytes +stdout: 1898 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 +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-021.expected b/clients/tests/test-client.check-on-disk/test_002-021.expected index d0a9ec630a..ab1173d45e 100644 --- a/clients/tests/test-client.check-on-disk/test_002-021.expected +++ b/clients/tests/test-client.check-on-disk/test_002-021.expected @@ -1,13 +1,11 @@ -location: clients/tests/test-client.py:597:test_002()/21 -cmd: $NMCLI -f AP -mode tabular d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:603:test_002()/21 +cmd: $NMCLI c +lang: C returncode: 0 -stdout: 304 bytes +stdout: 126 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 +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-022.expected b/clients/tests/test-client.check-on-disk/test_002-022.expected index 9c86c66c07..b48c35cdae 100644 --- a/clients/tests/test-client.check-on-disk/test_002-022.expected +++ b/clients/tests/test-client.check-on-disk/test_002-022.expected @@ -1,17 +1,11 @@ -location: clients/tests/test-client.py:598:test_002()/22 -cmd: $NMCLI -f AP -mode tabular -p d show wlan0 -lang: C +location: clients/tests/test-client.py:603:test_002()/22 +cmd: $NMCLI c +lang: pl_PL.UTF-8 returncode: 0 -stdout: 460 bytes +stdout: 126 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 +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-023.expected b/clients/tests/test-client.check-on-disk/test_002-023.expected index 63a6400e0c..e70ccfd669 100644 --- a/clients/tests/test-client.check-on-disk/test_002-023.expected +++ b/clients/tests/test-client.check-on-disk/test_002-023.expected @@ -1,17 +1,30 @@ -location: clients/tests/test-client.py:598:test_002()/23 -cmd: $NMCLI -f AP -mode tabular -p d show wlan0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:605:test_002()/23 +cmd: $NMCLI c s con-1 +lang: C returncode: 0 -stdout: 530 bytes +stdout: 990 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 +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-024.expected b/clients/tests/test-client.check-on-disk/test_002-024.expected index a7cfb4a95d..22801ef42b 100644 --- a/clients/tests/test-client.check-on-disk/test_002-024.expected +++ b/clients/tests/test-client.check-on-disk/test_002-024.expected @@ -1,17 +1,30 @@ -location: clients/tests/test-client.py:598:test_002()/24 -cmd: $NMCLI -f AP -mode tabular -p d show wlan0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:605:test_002()/24 +cmd: $NMCLI c s con-1 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 476 bytes +stdout: 992 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 +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-025.expected b/clients/tests/test-client.check-on-disk/test_002-025.expected deleted file mode 100644 index e639b9b868..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-025.expected +++ /dev/null @@ -1,15 +0,0 @@ -location: clients/tests/test-client.py:599: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 deleted file mode 100644 index 68c75f6fde..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-026.expected +++ /dev/null @@ -1,15 +0,0 @@ -location: clients/tests/test-client.py:599: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 deleted file mode 100644 index ca2f621e3c..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-027.expected +++ /dev/null @@ -1,15 +0,0 @@ -location: clients/tests/test-client.py:599: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 deleted file mode 100644 index 0d8cfbb8da..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-028.expected +++ /dev/null @@ -1,21 +0,0 @@ -location: clients/tests/test-client.py:601: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 deleted file mode 100644 index c15c545707..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-029.expected +++ /dev/null @@ -1,21 +0,0 @@ -location: clients/tests/test-client.py:601: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 deleted file mode 100644 index ab41cd8db4..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-030.expected +++ /dev/null @@ -1,21 +0,0 @@ -location: clients/tests/test-client.py:601: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 deleted file mode 100644 index b11ee85440..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-031.expected +++ /dev/null @@ -1,14 +0,0 @@ -location: clients/tests/test-client.py:603: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 deleted file mode 100644 index 1e752168c4..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-032.expected +++ /dev/null @@ -1,14 +0,0 @@ -location: clients/tests/test-client.py:603: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 deleted file mode 100644 index 85d97e904d..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-033.expected +++ /dev/null @@ -1,14 +0,0 @@ -location: clients/tests/test-client.py:603: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 deleted file mode 100644 index 613da4c4bc..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-034.expected +++ /dev/null @@ -1,33 +0,0 @@ -location: clients/tests/test-client.py:605: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 deleted file mode 100644 index a7c2a0fb57..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-035.expected +++ /dev/null @@ -1,33 +0,0 @@ -location: clients/tests/test-client.py:605: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 deleted file mode 100644 index 3cc781ec9c..0000000000 --- a/clients/tests/test-client.check-on-disk/test_002-036.expected +++ /dev/null @@ -1,33 +0,0 @@ -location: clients/tests/test-client.py:605: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-004.expected b/clients/tests/test-client.check-on-disk/test_003-004.expected index 3b533be8fa..29ef6fbadf 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,12 +1,10 @@ -location: clients/tests/test-client.py:618:test_003()/4 -cmd: $NMCLI c s -lang: de_DE.utf8 +location: clients/tests/test-client.py:623:test_003()/4 +cmd: $NMCLI c add type ethernet ifname '*' +lang: C returncode: 0 -stdout: 195 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 -- +Connection 'ethernet' (UUID-ethernet-REPLACED-REPLACED-REPL) successfully added. <<< 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 db3aa0a8f9..b32b1978e0 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,10 +1,13 @@ -location: clients/tests/test-client.py:623:test_003()/5 -cmd: $NMCLI c add type ethernet ifname '*' +location: clients/tests/test-client.py:626:test_003()/5 +cmd: $NMCLI c s lang: C returncode: 0 -stdout: 81 bytes +stdout: 264 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 -- +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet -- <<< 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 919b6417a4..c7f77f1e39 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,6 +1,6 @@ location: clients/tests/test-client.py:626:test_003()/6 cmd: $NMCLI c s -lang: C +lang: pl_PL.UTF-8 returncode: 0 stdout: 264 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 08bf7e4c61..67ef4f54a7 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:626:test_003()/7 -cmd: $NMCLI c s -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:629:test_003()/7 +cmd: $NMCLI -f ALL c s +lang: C returncode: 0 -stdout: 264 bytes +stdout: 912 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 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-008.expected b/clients/tests/test-client.check-on-disk/test_003-008.expected index 1b37ecc6fc..148b07f453 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,13 +1,13 @@ -location: clients/tests/test-client.py:626:test_003()/8 -cmd: $NMCLI c s -lang: de_DE.utf8 +location: clients/tests/test-client.py:629:test_003()/8 +cmd: $NMCLI -f ALL c s +lang: pl_PL.UTF-8 returncode: 0 -stdout: 264 bytes +stdout: 912 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 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-009.expected b/clients/tests/test-client.check-on-disk/test_003-009.expected index e5c73d06e9..27a8dd7e20 100644 --- a/clients/tests/test-client.check-on-disk/test_003-009.expected +++ b/clients/tests/test-client.check-on-disk/test_003-009.expected @@ -1,14 +1,20 @@ -location: clients/tests/test-client.py:629:test_003()/9 -cmd: $NMCLI -f ALL c s +location: clients/tests/test-client.py:633:test_003()/9 +cmd: $NMCLI --complete-args -f ALL c s '' lang: C returncode: 0 -stdout: 912 bytes +stdout: 64 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 -- -- -- -- +--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-010.expected b/clients/tests/test-client.check-on-disk/test_003-010.expected index 3777114226..310ee36bb7 100644 --- a/clients/tests/test-client.check-on-disk/test_003-010.expected +++ b/clients/tests/test-client.check-on-disk/test_003-010.expected @@ -1,14 +1,20 @@ -location: clients/tests/test-client.py:629:test_003()/10 -cmd: $NMCLI -f ALL c s +location: clients/tests/test-client.py:633:test_003()/10 +cmd: $NMCLI --complete-args -f ALL c s '' lang: pl_PL.UTF-8 returncode: 0 -stdout: 912 bytes +stdout: 64 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 -- -- -- -- +--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-011.expected b/clients/tests/test-client.check-on-disk/test_003-011.expected index 7d2b477d0f..54624dcafe 100644 --- a/clients/tests/test-client.check-on-disk/test_003-011.expected +++ b/clients/tests/test-client.check-on-disk/test_003-011.expected @@ -1,13 +1,10 @@ -location: clients/tests/test-client.py:629:test_003()/11 -cmd: $NMCLI -f ALL c s -lang: de_DE.utf8 +location: clients/tests/test-client.py:646:test_003()/11 +cmd: $NMCLI con up ethernet ifname eth0 +lang: C returncode: 0 -stdout: 912 bytes +stdout: 106 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 -- -- -- -- +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/1) <<< 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 index b2c86ffec9..1ab12034c1 100644 --- a/clients/tests/test-client.check-on-disk/test_003-012.expected +++ b/clients/tests/test-client.check-on-disk/test_003-012.expected @@ -1,20 +1,14 @@ -location: clients/tests/test-client.py:633:test_003()/12 -cmd: $NMCLI --complete-args -f ALL c s '' +location: clients/tests/test-client.py:649:test_003()/12 +cmd: $NMCLI con lang: C returncode: 0 -stdout: 64 bytes +stdout: 264 bytes >>> +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA 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-013.expected b/clients/tests/test-client.check-on-disk/test_003-013.expected index 1653c57331..a0f816a0cf 100644 --- a/clients/tests/test-client.check-on-disk/test_003-013.expected +++ b/clients/tests/test-client.check-on-disk/test_003-013.expected @@ -1,20 +1,14 @@ -location: clients/tests/test-client.py:633:test_003()/13 -cmd: $NMCLI --complete-args -f ALL c s '' +location: clients/tests/test-client.py:649:test_003()/13 +cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 -stdout: 64 bytes +stdout: 264 bytes >>> +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA 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-014.expected b/clients/tests/test-client.check-on-disk/test_003-014.expected index 8c7b049404..a5c2039f2d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-014.expected +++ b/clients/tests/test-client.check-on-disk/test_003-014.expected @@ -1,20 +1,14 @@ -location: clients/tests/test-client.py:633:test_003()/14 -cmd: $NMCLI --complete-args -f ALL c s '' -lang: de_DE.utf8 +location: clients/tests/test-client.py:652:test_003()/14 +cmd: $NMCLI -f ALL con +lang: C returncode: 0 -stdout: 64 bytes +stdout: 1084 bytes >>> +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- +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 -- -- -- -- ---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-015.expected b/clients/tests/test-client.check-on-disk/test_003-015.expected index c66ee7e031..75d4970fa5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-015.expected +++ b/clients/tests/test-client.check-on-disk/test_003-015.expected @@ -1,10 +1,13 @@ -location: clients/tests/test-client.py:646:test_003()/15 -cmd: $NMCLI con up ethernet ifname eth0 -lang: C +location: clients/tests/test-client.py:652:test_003()/15 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 returncode: 0 -stdout: 106 bytes +stdout: 1088 bytes >>> -Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/1) +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-016.expected b/clients/tests/test-client.check-on-disk/test_003-016.expected index 117e7e2003..868195bc4a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-016.expected +++ b/clients/tests/test-client.check-on-disk/test_003-016.expected @@ -1,13 +1,87 @@ -location: clients/tests/test-client.py:649:test_003()/16 -cmd: $NMCLI con +location: clients/tests/test-client.py:655:test_003()/16 +cmd: $NMCLI -f ALL con s ethernet lang: C returncode: 0 -stdout: 264 bytes +stdout: 3516 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-017.expected b/clients/tests/test-client.check-on-disk/test_003-017.expected index 2798b9067f..b1c5f7f973 100644 --- a/clients/tests/test-client.check-on-disk/test_003-017.expected +++ b/clients/tests/test-client.check-on-disk/test_003-017.expected @@ -1,13 +1,87 @@ -location: clients/tests/test-client.py:649:test_003()/17 -cmd: $NMCLI con +location: clients/tests/test-client.py:655:test_003()/17 +cmd: $NMCLI -f ALL con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 264 bytes +stdout: 3534 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-018.expected b/clients/tests/test-client.check-on-disk/test_003-018.expected index 64a96d8b81..d5da947aeb 100644 --- a/clients/tests/test-client.check-on-disk/test_003-018.expected +++ b/clients/tests/test-client.check-on-disk/test_003-018.expected @@ -1,13 +1,99 @@ -location: clients/tests/test-client.py:649:test_003()/18 -cmd: $NMCLI con -lang: de_DE.utf8 +location: clients/tests/test-client.py:658:test_003()/18 +cmd: $NMCLI con s ethernet +lang: C returncode: 0 -stdout: 264 bytes +stdout: 4180 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-019.expected b/clients/tests/test-client.check-on-disk/test_003-019.expected index fce3cecaa0..19f9ea393d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-019.expected +++ b/clients/tests/test-client.check-on-disk/test_003-019.expected @@ -1,13 +1,99 @@ -location: clients/tests/test-client.py:652:test_003()/19 -cmd: $NMCLI -f ALL con -lang: C +location: clients/tests/test-client.py:658:test_003()/19 +cmd: $NMCLI con s ethernet +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1084 bytes +stdout: 4201 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-020.expected b/clients/tests/test-client.check-on-disk/test_003-020.expected index 8bc9384c9f..832b2bb017 100644 --- a/clients/tests/test-client.check-on-disk/test_003-020.expected +++ b/clients/tests/test-client.check-on-disk/test_003-020.expected @@ -1,16 +1,19 @@ -location: clients/tests/test-client.py:652:test_003()/20 -cmd: $NMCLI -f ALL con -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:661:test_003()/20 +cmd: $NMCLI -f ALL dev s eth0 +lang: C returncode: 0 -stdout: 1088 bytes +stdout: 1056 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- -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 -- -- -- -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-021.expected b/clients/tests/test-client.check-on-disk/test_003-021.expected index 5d187a7255..eee653084c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-021.expected +++ b/clients/tests/test-client.check-on-disk/test_003-021.expected @@ -1,16 +1,19 @@ -location: clients/tests/test-client.py:652:test_003()/21 -cmd: $NMCLI -f ALL con -lang: de_DE.utf8 +location: clients/tests/test-client.py:661:test_003()/21 +cmd: $NMCLI -f ALL dev s eth0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1084 bytes +stdout: 1061 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 ja eth0 aktiviert /org/freedesktop/NetworkManager/ActiveConnection/1 -- -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 -- -- -- -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-022.expected b/clients/tests/test-client.check-on-disk/test_003-022.expected index 5ec947a0eb..d14a5f4557 100644 --- a/clients/tests/test-client.check-on-disk/test_003-022.expected +++ b/clients/tests/test-client.check-on-disk/test_003-022.expected @@ -1,87 +1,39 @@ -location: clients/tests/test-client.py:655:test_003()/22 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:664:test_003()/22 +cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 3516 bytes +stdout: 1487 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIRED-PROPERTIES.CARRIER: off +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-023.expected b/clients/tests/test-client.check-on-disk/test_003-023.expected index 21edcf4aaa..42254129c5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-023.expected +++ b/clients/tests/test-client.check-on-disk/test_003-023.expected @@ -1,87 +1,39 @@ -location: clients/tests/test-client.py:655:test_003()/23 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:664:test_003()/23 +cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 3534 bytes +stdout: 1510 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-024.expected b/clients/tests/test-client.check-on-disk/test_003-024.expected index 4eb33a6eaa..01dfb22ac9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-024.expected +++ b/clients/tests/test-client.check-on-disk/test_003-024.expected @@ -1,87 +1,10 @@ -location: clients/tests/test-client.py:655:test_003()/24 -cmd: $NMCLI -f ALL con s ethernet -lang: de_DE.utf8 +location: clients/tests/test-client.py:646:test_003()/24 +cmd: $NMCLI con up ethernet ifname eth1 +lang: C returncode: 0 -stdout: 3531 bytes +stdout: 106 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -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) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nein -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nein -ipv4.ignore-auto-dns: nein -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: ja -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nein -ipv4.may-fail: ja -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nein -ipv6.ignore-auto-dns: nein -ipv6.never-default: nein -ipv6.may-fail: ja -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: ja -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nein -proxy.pac-url: -- -proxy.pac-script: -- +Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2) <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-025.expected b/clients/tests/test-client.check-on-disk/test_003-025.expected index 2bc2d53973..f332a1aed4 100644 --- a/clients/tests/test-client.check-on-disk/test_003-025.expected +++ b/clients/tests/test-client.check-on-disk/test_003-025.expected @@ -1,99 +1,13 @@ -location: clients/tests/test-client.py:658:test_003()/25 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:649:test_003()/25 +cmd: $NMCLI con lang: C returncode: 0 -stdout: 4180 bytes +stdout: 264 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +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-026.expected b/clients/tests/test-client.check-on-disk/test_003-026.expected index ae8e64ae0e..dae13b9c4a 100644 --- a/clients/tests/test-client.check-on-disk/test_003-026.expected +++ b/clients/tests/test-client.check-on-disk/test_003-026.expected @@ -1,99 +1,13 @@ -location: clients/tests/test-client.py:658:test_003()/26 -cmd: $NMCLI con s ethernet +location: clients/tests/test-client.py:649:test_003()/26 +cmd: $NMCLI con lang: pl_PL.UTF-8 returncode: 0 -stdout: 4201 bytes +stdout: 264 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +NAME UUID TYPE DEVICE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 +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-027.expected b/clients/tests/test-client.check-on-disk/test_003-027.expected index 6a0e3863cd..ac579da794 100644 --- a/clients/tests/test-client.check-on-disk/test_003-027.expected +++ b/clients/tests/test-client.check-on-disk/test_003-027.expected @@ -1,99 +1,13 @@ -location: clients/tests/test-client.py:658:test_003()/27 -cmd: $NMCLI con s ethernet -lang: de_DE.utf8 +location: clients/tests/test-client.py:652:test_003()/27 +cmd: $NMCLI -f ALL con +lang: C returncode: 0 -stdout: 4201 bytes +stdout: 1084 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -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) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nein -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nein -ipv4.ignore-auto-dns: nein -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: ja -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nein -ipv4.may-fail: ja -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nein -ipv6.ignore-auto-dns: nein -ipv6.never-default: nein -ipv6.may-fail: ja -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: ja -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nein -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: nein -GENERAL.DEFAULT6: nein -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nein -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-028.expected b/clients/tests/test-client.check-on-disk/test_003-028.expected index 1ab559b12b..13f8bcc305 100644 --- a/clients/tests/test-client.check-on-disk/test_003-028.expected +++ b/clients/tests/test-client.check-on-disk/test_003-028.expected @@ -1,19 +1,16 @@ -location: clients/tests/test-client.py:661:test_003()/28 -cmd: $NMCLI -f ALL dev s eth0 -lang: C +location: clients/tests/test-client.py:652:test_003()/28 +cmd: $NMCLI -f ALL con +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1056 bytes +stdout: 1088 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-029.expected b/clients/tests/test-client.check-on-disk/test_003-029.expected index 2d69684307..f5d1460809 100644 --- a/clients/tests/test-client.check-on-disk/test_003-029.expected +++ b/clients/tests/test-client.check-on-disk/test_003-029.expected @@ -1,19 +1,90 @@ -location: clients/tests/test-client.py:661:test_003()/29 -cmd: $NMCLI -f ALL dev s eth0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:655:test_003()/29 +cmd: $NMCLI -f ALL con s ethernet +lang: C returncode: 0 -stdout: 1061 bytes +stdout: 3516 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-030.expected b/clients/tests/test-client.check-on-disk/test_003-030.expected index 4cbe1eed4f..cca85878ad 100644 --- a/clients/tests/test-client.check-on-disk/test_003-030.expected +++ b/clients/tests/test-client.check-on-disk/test_003-030.expected @@ -1,19 +1,90 @@ -location: clients/tests/test-client.py:661:test_003()/30 -cmd: $NMCLI -f ALL dev s eth0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:655:test_003()/30 +cmd: $NMCLI -f ALL con s ethernet +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1085 bytes +stdout: 3534 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -eth1 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 -- -- -- -wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- <<< -stderr: 28 bytes +stderr: 0 bytes >>> -Unbekannter Parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-031.expected b/clients/tests/test-client.check-on-disk/test_003-031.expected index 6fdb94cb5f..c61cf39df6 100644 --- a/clients/tests/test-client.check-on-disk/test_003-031.expected +++ b/clients/tests/test-client.check-on-disk/test_003-031.expected @@ -1,39 +1,112 @@ -location: clients/tests/test-client.py:664:test_003()/31 -cmd: $NMCLI -f ALL dev show eth0 +location: clients/tests/test-client.py:658:test_003()/31 +cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 1487 bytes +stdout: 4845 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (unavailable) -GENERAL.REASON: 0 (No reason given) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: no -GENERAL.NM-MANAGED: yes -GENERAL.AUTOCONNECT: yes -GENERAL.FIRMWARE-MISSING: no -GENERAL.NM-PLUGIN-MISSING: no -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unknown -CAPABILITIES.CARRIER-DETECT: no -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: no -CAPABILITIES.SRIOV: no -WIRED-PROPERTIES.CARRIER: off -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-032.expected b/clients/tests/test-client.check-on-disk/test_003-032.expected index d5115e30eb..c96f65001d 100644 --- a/clients/tests/test-client.check-on-disk/test_003-032.expected +++ b/clients/tests/test-client.check-on-disk/test_003-032.expected @@ -1,39 +1,112 @@ -location: clients/tests/test-client.py:664:test_003()/32 -cmd: $NMCLI -f ALL dev show eth0 +location: clients/tests/test-client.py:658:test_003()/32 +cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 1510 bytes +stdout: 4869 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (niedostępne) -GENERAL.REASON: 0 (Nie podano przyczyny) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nie -GENERAL.NM-MANAGED: tak -GENERAL.AUTOCONNECT: tak -GENERAL.FIRMWARE-MISSING: nie -GENERAL.NM-PLUGIN-MISSING: nie -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: nieznane -CAPABILITIES.CARRIER-DETECT: nie -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nie -CAPABILITIES.SRIOV: nie -WIRED-PROPERTIES.CARRIER: wyłączone -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-033.expected b/clients/tests/test-client.check-on-disk/test_003-033.expected index f53bd92277..f27a0a3492 100644 --- a/clients/tests/test-client.check-on-disk/test_003-033.expected +++ b/clients/tests/test-client.check-on-disk/test_003-033.expected @@ -1,42 +1,19 @@ -location: clients/tests/test-client.py:664:test_003()/33 -cmd: $NMCLI -f ALL dev show eth0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:661:test_003()/33 +cmd: $NMCLI -f ALL dev s eth0 +lang: C returncode: 0 -stdout: 1509 bytes +stdout: 1056 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (nicht verfügbar) -GENERAL.REASON: 0 (Kein Grund angegeben) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nein -GENERAL.NM-MANAGED: ja -GENERAL.AUTOCONNECT: ja -GENERAL.FIRMWARE-MISSING: nein -GENERAL.NM-PLUGIN-MISSING: nein -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unbekannt -CAPABILITIES.CARRIER-DETECT: nein -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nein -CAPABILITIES.SRIOV: nein -WIRED-PROPERTIES.CARRIER: aus -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-034.expected b/clients/tests/test-client.check-on-disk/test_003-034.expected index 144c0653d4..18ef705f3e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-034.expected +++ b/clients/tests/test-client.check-on-disk/test_003-034.expected @@ -1,13 +1,19 @@ -location: clients/tests/test-client.py:646:test_003()/34 -cmd: $NMCLI con up ethernet ifname eth1 -lang: C +location: clients/tests/test-client.py:661:test_003()/34 +cmd: $NMCLI -f ALL dev s eth0 +lang: pl_PL.UTF-8 returncode: 0 -stdout: 106 bytes +stdout: 1061 bytes >>> -Connection successfully activated (D-Bus active path: /org/freedesktop/NetworkManager/ActiveConnection/2) +DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH +wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- +wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- +eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 +eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 <<< -stderr: 0 bytes +stderr: 24 bytes >>> +Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-035.expected b/clients/tests/test-client.check-on-disk/test_003-035.expected index d5a69fc185..93059163e5 100644 --- a/clients/tests/test-client.check-on-disk/test_003-035.expected +++ b/clients/tests/test-client.check-on-disk/test_003-035.expected @@ -1,13 +1,39 @@ -location: clients/tests/test-client.py:649:test_003()/35 -cmd: $NMCLI con +location: clients/tests/test-client.py:664:test_003()/35 +cmd: $NMCLI -f ALL dev show eth0 lang: C returncode: 0 -stdout: 264 bytes +stdout: 1487 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (unavailable) +GENERAL.REASON: 0 (No reason given) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: no +GENERAL.NM-MANAGED: yes +GENERAL.AUTOCONNECT: yes +GENERAL.FIRMWARE-MISSING: no +GENERAL.NM-PLUGIN-MISSING: no +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: unknown +CAPABILITIES.CARRIER-DETECT: no +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: no +CAPABILITIES.SRIOV: no +WIRED-PROPERTIES.CARRIER: off +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-036.expected b/clients/tests/test-client.check-on-disk/test_003-036.expected index 3ad180f969..94f76f4b15 100644 --- a/clients/tests/test-client.check-on-disk/test_003-036.expected +++ b/clients/tests/test-client.check-on-disk/test_003-036.expected @@ -1,13 +1,39 @@ -location: clients/tests/test-client.py:649:test_003()/36 -cmd: $NMCLI con +location: clients/tests/test-client.py:664:test_003()/36 +cmd: $NMCLI -f ALL dev show eth0 lang: pl_PL.UTF-8 returncode: 0 -stdout: 264 bytes +stdout: 1510 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +GENERAL.DEVICE: eth0 +GENERAL.TYPE: ethernet +GENERAL.NM-TYPE: NMDeviceEthernet +GENERAL.VENDOR: -- +GENERAL.PRODUCT: -- +GENERAL.DRIVER: virtual +GENERAL.DRIVER-VERSION: -- +GENERAL.FIRMWARE-VERSION: -- +GENERAL.HWADDR: 72:41:AB:90:41:5D +GENERAL.MTU: 0 +GENERAL.STATE: 20 (niedostępne) +GENERAL.REASON: 0 (Nie podano przyczyny) +GENERAL.UDI: /sys/devices/virtual/eth0 +GENERAL.IP-IFACE: -- +GENERAL.IS-SOFTWARE: nie +GENERAL.NM-MANAGED: tak +GENERAL.AUTOCONNECT: tak +GENERAL.FIRMWARE-MISSING: nie +GENERAL.NM-PLUGIN-MISSING: nie +GENERAL.PHYS-PORT-ID: -- +GENERAL.CONNECTION: ethernet +GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.METERED: nieznane +CAPABILITIES.CARRIER-DETECT: nie +CAPABILITIES.SPEED: 100 Mb/s +CAPABILITIES.IS-SOFTWARE: nie +CAPABILITIES.SRIOV: nie +WIRED-PROPERTIES.CARRIER: wyłączone +CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-037.expected b/clients/tests/test-client.check-on-disk/test_003-037.expected index e795d67ff9..6506712d67 100644 --- a/clients/tests/test-client.check-on-disk/test_003-037.expected +++ b/clients/tests/test-client.check-on-disk/test_003-037.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:649:test_003()/37 -cmd: $NMCLI con -lang: de_DE.utf8 +location: clients/tests/test-client.py:671:test_003()/37 +cmd: $NMCLI -f ALL con +lang: C returncode: 0 -stdout: 264 bytes +stdout: 1096 bytes >>> -NAME UUID TYPE DEVICE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet eth0 -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-038.expected b/clients/tests/test-client.check-on-disk/test_003-038.expected index 1e49e990cd..9f9dd494bd 100644 --- a/clients/tests/test-client.check-on-disk/test_003-038.expected +++ b/clients/tests/test-client.check-on-disk/test_003-038.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:652:test_003()/38 +location: clients/tests/test-client.py:671:test_003()/38 cmd: $NMCLI -f ALL con -lang: C +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1084 bytes +stdout: 1104 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 activated /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE +ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- +con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- +con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-039.expected b/clients/tests/test-client.check-on-disk/test_003-039.expected index 59d2e9d16d..93f6715843 100644 --- a/clients/tests/test-client.check-on-disk/test_003-039.expected +++ b/clients/tests/test-client.check-on-disk/test_003-039.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:652:test_003()/39 -cmd: $NMCLI -f ALL con -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:674:test_003()/39 +cmd: $NMCLI -f UUID,TYPE con +lang: C returncode: 0 -stdout: 1088 bytes +stdout: 192 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 aktywowano /org/freedesktop/NetworkManager/ActiveConnection/1 -- -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 -- -- -- -- +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-040.expected b/clients/tests/test-client.check-on-disk/test_003-040.expected index 7599373047..978abd1a5e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-040.expected +++ b/clients/tests/test-client.check-on-disk/test_003-040.expected @@ -1,13 +1,13 @@ -location: clients/tests/test-client.py:652:test_003()/40 -cmd: $NMCLI -f ALL con -lang: de_DE.utf8 +location: clients/tests/test-client.py:674:test_003()/40 +cmd: $NMCLI -f UUID,TYPE con +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1084 bytes +stdout: 192 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 ja eth0 aktiviert /org/freedesktop/NetworkManager/ActiveConnection/1 -- -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 -- -- -- -- +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-041.expected b/clients/tests/test-client.check-on-disk/test_003-041.expected index f00861e0cf..4a499e8a40 100644 --- a/clients/tests/test-client.check-on-disk/test_003-041.expected +++ b/clients/tests/test-client.check-on-disk/test_003-041.expected @@ -1,87 +1,15 @@ -location: clients/tests/test-client.py:655:test_003()/41 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:677:test_003()/41 +cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: C returncode: 0 -stdout: 3516 bytes +stdout: 378 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-042.expected b/clients/tests/test-client.check-on-disk/test_003-042.expected index 8d27461363..d34996d0f9 100644 --- a/clients/tests/test-client.check-on-disk/test_003-042.expected +++ b/clients/tests/test-client.check-on-disk/test_003-042.expected @@ -1,87 +1,15 @@ -location: clients/tests/test-client.py:655:test_003()/42 -cmd: $NMCLI -f ALL con s ethernet +location: clients/tests/test-client.py:677:test_003()/42 +cmd: $NMCLI -f UUID,TYPE --mode multiline con lang: pl_PL.UTF-8 returncode: 0 -stdout: 3534 bytes +stdout: 378 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-043.expected b/clients/tests/test-client.check-on-disk/test_003-043.expected index 6509f3599b..98b6955242 100644 --- a/clients/tests/test-client.check-on-disk/test_003-043.expected +++ b/clients/tests/test-client.check-on-disk/test_003-043.expected @@ -1,87 +1,15 @@ -location: clients/tests/test-client.py:655:test_003()/43 -cmd: $NMCLI -f ALL con s ethernet -lang: de_DE.utf8 +location: clients/tests/test-client.py:680:test_003()/43 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: C returncode: 0 -stdout: 3531 bytes +stdout: 186 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -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) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nein -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nein -ipv4.ignore-auto-dns: nein -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: ja -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nein -ipv4.may-fail: ja -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nein -ipv6.ignore-auto-dns: nein -ipv6.never-default: nein -ipv6.may-fail: ja -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: ja -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nein -proxy.pac-url: -- -proxy.pac-script: -- +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-044.expected b/clients/tests/test-client.check-on-disk/test_003-044.expected index e6f4a9fc30..59b391b531 100644 --- a/clients/tests/test-client.check-on-disk/test_003-044.expected +++ b/clients/tests/test-client.check-on-disk/test_003-044.expected @@ -1,112 +1,15 @@ -location: clients/tests/test-client.py:658:test_003()/44 -cmd: $NMCLI con s ethernet -lang: C +location: clients/tests/test-client.py:680:test_003()/44 +cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con +lang: pl_PL.UTF-8 returncode: 0 -stdout: 4845 bytes +stdout: 186 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +UUID:UUID-ethernet-REPLACED-REPLACED-REPL +TYPE:802-3-ethernet +UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE:802-3-ethernet +UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-045.expected b/clients/tests/test-client.check-on-disk/test_003-045.expected index 3d75dc2161..fcb2d89335 100644 --- a/clients/tests/test-client.check-on-disk/test_003-045.expected +++ b/clients/tests/test-client.check-on-disk/test_003-045.expected @@ -1,112 +1,21 @@ -location: clients/tests/test-client.py:658:test_003()/45 -cmd: $NMCLI con s ethernet -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:683:test_003()/45 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: C returncode: 0 -stdout: 4869 bytes +stdout: 835 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +=============================================================================== + NetworkManager connection profiles +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-046.expected b/clients/tests/test-client.check-on-disk/test_003-046.expected index 526c2517e3..09d7bce20c 100644 --- a/clients/tests/test-client.check-on-disk/test_003-046.expected +++ b/clients/tests/test-client.check-on-disk/test_003-046.expected @@ -1,112 +1,21 @@ -location: clients/tests/test-client.py:658:test_003()/46 -cmd: $NMCLI con s ethernet -lang: de_DE.utf8 +location: clients/tests/test-client.py:683:test_003()/46 +cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con +lang: pl_PL.UTF-8 returncode: 0 -stdout: 4872 bytes +stdout: 841 bytes >>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -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) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nein -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nein -ipv4.ignore-auto-dns: nein -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: ja -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nein -ipv4.may-fail: ja -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nein -ipv6.ignore-auto-dns: nein -ipv6.never-default: nein -ipv6.may-fail: ja -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: ja -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nein -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: activated -GENERAL.DEFAULT: nein -GENERAL.DEFAULT6: nein -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nein -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: nein -GENERAL.DEFAULT6: nein -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nein -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- +=============================================================================== + Profile połączeń usługi NetworkManager +=============================================================================== +UUID: UUID-ethernet-REPLACED-REPLACED-REPL +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d +TYPE: ethernet +------------------------------------------------------------------------------- +UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA +TYPE: ethernet +------------------------------------------------------------------------------- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-047.expected b/clients/tests/test-client.check-on-disk/test_003-047.expected index bbb04d5299..bae911d8eb 100644 --- a/clients/tests/test-client.check-on-disk/test_003-047.expected +++ b/clients/tests/test-client.check-on-disk/test_003-047.expected @@ -1,19 +1,16 @@ -location: clients/tests/test-client.py:661:test_003()/47 -cmd: $NMCLI -f ALL dev s eth0 +location: clients/tests/test-client.py:686:test_003()/47 +cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: C returncode: 0 -stdout: 1056 bytes +stdout: 192 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi unavailable /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi unavailable /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet unavailable /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 -eth1 ethernet unavailable /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Unknown parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-048.expected b/clients/tests/test-client.check-on-disk/test_003-048.expected index aa360ef1c7..69f5bc7c8b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-048.expected +++ b/clients/tests/test-client.check-on-disk/test_003-048.expected @@ -1,19 +1,16 @@ -location: clients/tests/test-client.py:661:test_003()/48 -cmd: $NMCLI -f ALL dev s eth0 +location: clients/tests/test-client.py:686:test_003()/48 +cmd: $NMCLI -f UUID,TYPE --mode tabular con lang: pl_PL.UTF-8 returncode: 0 -stdout: 1061 bytes +stdout: 192 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi niedostępne /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi niedostępne /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 -eth1 ethernet niedostępne /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 +UUID TYPE +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< -stderr: 24 bytes +stderr: 0 bytes >>> -Nieznany parametr: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-049.expected b/clients/tests/test-client.check-on-disk/test_003-049.expected index 736d4421fd..7e76d41946 100644 --- a/clients/tests/test-client.check-on-disk/test_003-049.expected +++ b/clients/tests/test-client.check-on-disk/test_003-049.expected @@ -1,19 +1,15 @@ -location: clients/tests/test-client.py:661:test_003()/49 -cmd: $NMCLI -f ALL dev s eth0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:689:test_003()/49 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: C returncode: 0 -stdout: 1085 bytes +stdout: 156 bytes >>> -DEVICE TYPE STATE DBUS-PATH CONNECTION CON-UUID CON-PATH -wlan0 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/3 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/4 -- -- -- -wlan1 wifi nicht verfügbar /org/freedesktop/NetworkManager/Devices/5 -- -- -- -eth0 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/1 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/1 -eth1 ethernet nicht verfügbar /org/freedesktop/NetworkManager/Devices/2 ethernet UUID-ethernet-REPLACED-REPLACED-REPL /org/freedesktop/NetworkManager/ActiveConnection/2 +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< -stderr: 28 bytes +stderr: 0 bytes >>> -Unbekannter Parameter: eth0 <<< diff --git a/clients/tests/test-client.check-on-disk/test_003-050.expected b/clients/tests/test-client.check-on-disk/test_003-050.expected index be2ccb1e64..930375ad58 100644 --- a/clients/tests/test-client.check-on-disk/test_003-050.expected +++ b/clients/tests/test-client.check-on-disk/test_003-050.expected @@ -1,39 +1,12 @@ -location: clients/tests/test-client.py:664:test_003()/50 -cmd: $NMCLI -f ALL dev show eth0 -lang: C +location: clients/tests/test-client.py:689:test_003()/50 +cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1487 bytes +stdout: 156 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (unavailable) -GENERAL.REASON: 0 (No reason given) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: no -GENERAL.NM-MANAGED: yes -GENERAL.AUTOCONNECT: yes -GENERAL.FIRMWARE-MISSING: no -GENERAL.NM-PLUGIN-MISSING: no -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unknown -CAPABILITIES.CARRIER-DETECT: no -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: no -CAPABILITIES.SRIOV: no -WIRED-PROPERTIES.CARRIER: off -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-051.expected b/clients/tests/test-client.check-on-disk/test_003-051.expected index 7335505190..980d0820f2 100644 --- a/clients/tests/test-client.check-on-disk/test_003-051.expected +++ b/clients/tests/test-client.check-on-disk/test_003-051.expected @@ -1,39 +1,17 @@ -location: clients/tests/test-client.py:664:test_003()/51 -cmd: $NMCLI -f ALL dev show eth0 -lang: pl_PL.UTF-8 +location: clients/tests/test-client.py:692:test_003()/51 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: C returncode: 0 -stdout: 1510 bytes +stdout: 394 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (niedostępne) -GENERAL.REASON: 0 (Nie podano przyczyny) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nie -GENERAL.NM-MANAGED: tak -GENERAL.AUTOCONNECT: tak -GENERAL.FIRMWARE-MISSING: nie -GENERAL.NM-PLUGIN-MISSING: nie -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: nieznane -CAPABILITIES.CARRIER-DETECT: nie -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nie -CAPABILITIES.SRIOV: nie -WIRED-PROPERTIES.CARRIER: wyłączone -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +====================================== + NetworkManager connection profiles +====================================== +UUID TYPE +-------------------------------------------------------------------------------------- +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-052.expected b/clients/tests/test-client.check-on-disk/test_003-052.expected index ef0b775740..c68c6b7ad3 100644 --- a/clients/tests/test-client.check-on-disk/test_003-052.expected +++ b/clients/tests/test-client.check-on-disk/test_003-052.expected @@ -1,39 +1,17 @@ -location: clients/tests/test-client.py:664:test_003()/52 -cmd: $NMCLI -f ALL dev show eth0 -lang: de_DE.utf8 +location: clients/tests/test-client.py:692:test_003()/52 +cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con +lang: pl_PL.UTF-8 returncode: 0 -stdout: 1509 bytes +stdout: 414 bytes >>> -GENERAL.DEVICE: eth0 -GENERAL.TYPE: ethernet -GENERAL.NM-TYPE: NMDeviceEthernet -GENERAL.VENDOR: -- -GENERAL.PRODUCT: -- -GENERAL.DRIVER: virtual -GENERAL.DRIVER-VERSION: -- -GENERAL.FIRMWARE-VERSION: -- -GENERAL.HWADDR: 72:41:AB:90:41:5D -GENERAL.MTU: 0 -GENERAL.STATE: 20 (nicht verfügbar) -GENERAL.REASON: 0 (Kein Grund angegeben) -GENERAL.UDI: /sys/devices/virtual/eth0 -GENERAL.IP-IFACE: -- -GENERAL.IS-SOFTWARE: nein -GENERAL.NM-MANAGED: ja -GENERAL.AUTOCONNECT: ja -GENERAL.FIRMWARE-MISSING: nein -GENERAL.NM-PLUGIN-MISSING: nein -GENERAL.PHYS-PORT-ID: -- -GENERAL.CONNECTION: ethernet -GENERAL.CON-UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.METERED: unbekannt -CAPABILITIES.CARRIER-DETECT: nein -CAPABILITIES.SPEED: 100 Mb/s -CAPABILITIES.IS-SOFTWARE: nein -CAPABILITIES.SRIOV: nein -WIRED-PROPERTIES.CARRIER: aus -CONNECTIONS.AVAILABLE-CONNECTION-PATHS: -- +========================================== + Profile połączeń usługi NetworkManager +========================================== +UUID TYPE +------------------------------------------------------------------------------------------ +UUID-ethernet-REPLACED-REPLACED-REPL ethernet +5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet +UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-053.expected b/clients/tests/test-client.check-on-disk/test_003-053.expected index 29e9244712..de0cb2398e 100644 --- a/clients/tests/test-client.check-on-disk/test_003-053.expected +++ b/clients/tests/test-client.check-on-disk/test_003-053.expected @@ -1,13 +1,112 @@ -location: clients/tests/test-client.py:671:test_003()/53 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:695:test_003()/53 +cmd: $NMCLI con s ethernet lang: C returncode: 0 -stdout: 1096 bytes +stdout: 4848 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/3 yes eth0 deactivating /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/1 no -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 never yes 0 no /org/freedesktop/NetworkManager/Settings/Connection/2 no -- -- -- -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: yes +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: no +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: unknown +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: no +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: auto +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: no +ipv4.ignore-auto-dns: no +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: yes +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: no +ipv4.may-fail: yes +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: no +ipv6.ignore-auto-dns: no +ipv6.never-default: no +ipv6.may-fail: yes +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: yes +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: no +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: no +GENERAL.DEFAULT6: no +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: no +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-054.expected b/clients/tests/test-client.check-on-disk/test_003-054.expected index 9e8aefe3d9..8f64284d0b 100644 --- a/clients/tests/test-client.check-on-disk/test_003-054.expected +++ b/clients/tests/test-client.check-on-disk/test_003-054.expected @@ -1,13 +1,112 @@ -location: clients/tests/test-client.py:671:test_003()/54 -cmd: $NMCLI -f ALL con +location: clients/tests/test-client.py:695:test_003()/54 +cmd: $NMCLI con s ethernet lang: pl_PL.UTF-8 returncode: 0 -stdout: 1104 bytes +stdout: 4872 bytes >>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/3 tak eth0 dezaktywowanie /org/freedesktop/NetworkManager/ActiveConnection/1 -- -con-1 5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/1 nie -- -- -- -- -con-xx1 UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet 0 nigdy tak 0 nie /org/freedesktop/NetworkManager/Settings/Connection/2 nie -- -- -- -- +connection.id: ethernet +connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL +connection.stable-id: -- +connection.type: 802-3-ethernet +connection.interface-name: -- +connection.autoconnect: tak +connection.autoconnect-priority: 0 +connection.autoconnect-retries: -1 (default) +connection.auth-retries: -1 +connection.timestamp: 0 +connection.read-only: nie +connection.permissions: -- +connection.zone: -- +connection.master: -- +connection.slave-type: -- +connection.autoconnect-slaves: -1 (default) +connection.secondaries: -- +connection.gateway-ping-timeout: 0 +connection.metered: nieznane +connection.lldp: default +connection.mdns: -1 (default) +802-3-ethernet.port: -- +802-3-ethernet.speed: 0 +802-3-ethernet.duplex: -- +802-3-ethernet.auto-negotiate: nie +802-3-ethernet.mac-address: -- +802-3-ethernet.cloned-mac-address: -- +802-3-ethernet.generate-mac-address-mask:-- +802-3-ethernet.mac-address-blacklist: -- +802-3-ethernet.mtu: automatyczne +802-3-ethernet.s390-subchannels: -- +802-3-ethernet.s390-nettype: -- +802-3-ethernet.s390-options: -- +802-3-ethernet.wake-on-lan: default +802-3-ethernet.wake-on-lan-password: -- +ipv4.method: auto +ipv4.dns: -- +ipv4.dns-search: -- +ipv4.dns-options: "" +ipv4.dns-priority: 0 +ipv4.addresses: -- +ipv4.gateway: -- +ipv4.routes: -- +ipv4.route-metric: -1 +ipv4.route-table: 0 (unspec) +ipv4.ignore-auto-routes: nie +ipv4.ignore-auto-dns: nie +ipv4.dhcp-client-id: -- +ipv4.dhcp-timeout: 0 (default) +ipv4.dhcp-send-hostname: tak +ipv4.dhcp-hostname: -- +ipv4.dhcp-fqdn: -- +ipv4.never-default: nie +ipv4.may-fail: tak +ipv4.dad-timeout: -1 (default) +ipv6.method: auto +ipv6.dns: -- +ipv6.dns-search: -- +ipv6.dns-options: "" +ipv6.dns-priority: 0 +ipv6.addresses: -- +ipv6.gateway: -- +ipv6.routes: -- +ipv6.route-metric: -1 +ipv6.route-table: 0 (unspec) +ipv6.ignore-auto-routes: nie +ipv6.ignore-auto-dns: nie +ipv6.never-default: nie +ipv6.may-fail: tak +ipv6.ip6-privacy: -1 (unknown) +ipv6.addr-gen-mode: stable-privacy +ipv6.dhcp-send-hostname: tak +ipv6.dhcp-hostname: -- +ipv6.token: -- +proxy.method: none +proxy.browser-only: nie +proxy.pac-url: -- +proxy.pac-script: -- +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth0 +GENERAL.STATE: deactivating +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- + +GENERAL.NAME: ethernet +GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL +GENERAL.DEVICES: eth1 +GENERAL.STATE: activated +GENERAL.DEFAULT: nie +GENERAL.DEFAULT6: nie +GENERAL.SPEC-OBJECT: -- +GENERAL.VPN: nie +GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 +GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 +GENERAL.ZONE: -- +GENERAL.MASTER-PATH: -- <<< stderr: 0 bytes diff --git a/clients/tests/test-client.check-on-disk/test_003-055.expected b/clients/tests/test-client.check-on-disk/test_003-055.expected deleted file mode 100644 index d0389db709..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-055.expected +++ /dev/null @@ -1,16 +0,0 @@ -location: clients/tests/test-client.py:671:test_003()/55 -cmd: $NMCLI -f ALL con -lang: de_DE.utf8 -returncode: 0 -stdout: 1112 bytes ->>> -NAME UUID TYPE TIMESTAMP TIMESTAMP-REAL AUTOCONNECT AUTOCONNECT-PRIORITY READONLY DBUS-PATH ACTIVE DEVICE STATE ACTIVE-PATH SLAVE -ethernet UUID-ethernet-REPLACED-REPLACED-REPL ethernet 0 nie ja 0 nein /org/freedesktop/NetworkManager/Settings/Connection/3 ja eth0 wird deaktiviert /org/freedesktop/NetworkManager/ActiveConnection/1 -- -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 -- -- -- -- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-056.expected b/clients/tests/test-client.check-on-disk/test_003-056.expected deleted file mode 100644 index 647867b9c2..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-056.expected +++ /dev/null @@ -1,16 +0,0 @@ -location: clients/tests/test-client.py:674:test_003()/56 -cmd: $NMCLI -f UUID,TYPE con -lang: C -returncode: 0 -stdout: 192 bytes ->>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-057.expected b/clients/tests/test-client.check-on-disk/test_003-057.expected deleted file mode 100644 index c9825577a5..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-057.expected +++ /dev/null @@ -1,16 +0,0 @@ -location: clients/tests/test-client.py:674:test_003()/57 -cmd: $NMCLI -f UUID,TYPE con -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 192 bytes ->>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-058.expected b/clients/tests/test-client.check-on-disk/test_003-058.expected deleted file mode 100644 index 3ae660befb..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-058.expected +++ /dev/null @@ -1,16 +0,0 @@ -location: clients/tests/test-client.py:674:test_003()/58 -cmd: $NMCLI -f UUID,TYPE con -lang: de_DE.utf8 -returncode: 0 -stdout: 192 bytes ->>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-059.expected b/clients/tests/test-client.check-on-disk/test_003-059.expected deleted file mode 100644 index d0eb8fd021..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-059.expected +++ /dev/null @@ -1,18 +0,0 @@ -location: clients/tests/test-client.py:677:test_003()/59 -cmd: $NMCLI -f UUID,TYPE --mode multiline con -lang: C -returncode: 0 -stdout: 378 bytes ->>> -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-060.expected b/clients/tests/test-client.check-on-disk/test_003-060.expected deleted file mode 100644 index 428b5352a7..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-060.expected +++ /dev/null @@ -1,18 +0,0 @@ -location: clients/tests/test-client.py:677:test_003()/60 -cmd: $NMCLI -f UUID,TYPE --mode multiline con -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 378 bytes ->>> -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-061.expected b/clients/tests/test-client.check-on-disk/test_003-061.expected deleted file mode 100644 index d83c21b6be..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-061.expected +++ /dev/null @@ -1,18 +0,0 @@ -location: clients/tests/test-client.py:677:test_003()/61 -cmd: $NMCLI -f UUID,TYPE --mode multiline con -lang: de_DE.utf8 -returncode: 0 -stdout: 378 bytes ->>> -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-062.expected b/clients/tests/test-client.check-on-disk/test_003-062.expected deleted file mode 100644 index 6df46f6171..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-062.expected +++ /dev/null @@ -1,18 +0,0 @@ -location: clients/tests/test-client.py:680:test_003()/62 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con -lang: C -returncode: 0 -stdout: 186 bytes ->>> -UUID:UUID-ethernet-REPLACED-REPLACED-REPL -TYPE:802-3-ethernet -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-063.expected b/clients/tests/test-client.check-on-disk/test_003-063.expected deleted file mode 100644 index 068fab1f5b..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-063.expected +++ /dev/null @@ -1,18 +0,0 @@ -location: clients/tests/test-client.py:680:test_003()/63 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 186 bytes ->>> -UUID:UUID-ethernet-REPLACED-REPLACED-REPL -TYPE:802-3-ethernet -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-064.expected b/clients/tests/test-client.check-on-disk/test_003-064.expected deleted file mode 100644 index 054e6619cf..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-064.expected +++ /dev/null @@ -1,18 +0,0 @@ -location: clients/tests/test-client.py:680:test_003()/64 -cmd: $NMCLI -f UUID,TYPE --mode multiline --terse con -lang: de_DE.utf8 -returncode: 0 -stdout: 186 bytes ->>> -UUID:UUID-ethernet-REPLACED-REPLACED-REPL -TYPE:802-3-ethernet -UUID:5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE:802-3-ethernet -UUID:UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE:802-3-ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-065.expected b/clients/tests/test-client.check-on-disk/test_003-065.expected deleted file mode 100644 index a7d991d858..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-065.expected +++ /dev/null @@ -1,24 +0,0 @@ -location: clients/tests/test-client.py:683:test_003()/65 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con -lang: C -returncode: 0 -stdout: 835 bytes ->>> -=============================================================================== - NetworkManager connection profiles -=============================================================================== -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet -------------------------------------------------------------------------------- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-066.expected b/clients/tests/test-client.check-on-disk/test_003-066.expected deleted file mode 100644 index fd53d66711..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-066.expected +++ /dev/null @@ -1,24 +0,0 @@ -location: clients/tests/test-client.py:683:test_003()/66 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 841 bytes ->>> -=============================================================================== - Profile połączeń usługi NetworkManager -=============================================================================== -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet -------------------------------------------------------------------------------- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-067.expected b/clients/tests/test-client.check-on-disk/test_003-067.expected deleted file mode 100644 index d22b8582d4..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-067.expected +++ /dev/null @@ -1,24 +0,0 @@ -location: clients/tests/test-client.py:683:test_003()/67 -cmd: $NMCLI -f UUID,TYPE --mode multiline --pretty con -lang: de_DE.utf8 -returncode: 0 -stdout: 835 bytes ->>> -=============================================================================== - NetworkManager Verbindungsprofile -=============================================================================== -UUID: UUID-ethernet-REPLACED-REPLACED-REPL -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: 5fcfd6d7-1e63-3332-8826-a7eda103792d -TYPE: ethernet -------------------------------------------------------------------------------- -UUID: UUID-con-xx1-REPLACED-REPLACED-REPLA -TYPE: ethernet -------------------------------------------------------------------------------- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-068.expected b/clients/tests/test-client.check-on-disk/test_003-068.expected deleted file mode 100644 index 2e303c963b..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-068.expected +++ /dev/null @@ -1,16 +0,0 @@ -location: clients/tests/test-client.py:686:test_003()/68 -cmd: $NMCLI -f UUID,TYPE --mode tabular con -lang: C -returncode: 0 -stdout: 192 bytes ->>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-069.expected b/clients/tests/test-client.check-on-disk/test_003-069.expected deleted file mode 100644 index 9f637a8c63..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-069.expected +++ /dev/null @@ -1,16 +0,0 @@ -location: clients/tests/test-client.py:686:test_003()/69 -cmd: $NMCLI -f UUID,TYPE --mode tabular con -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 192 bytes ->>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-070.expected b/clients/tests/test-client.check-on-disk/test_003-070.expected deleted file mode 100644 index 3ca3df604b..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-070.expected +++ /dev/null @@ -1,16 +0,0 @@ -location: clients/tests/test-client.py:686:test_003()/70 -cmd: $NMCLI -f UUID,TYPE --mode tabular con -lang: de_DE.utf8 -returncode: 0 -stdout: 192 bytes ->>> -UUID TYPE -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-071.expected b/clients/tests/test-client.check-on-disk/test_003-071.expected deleted file mode 100644 index 894b8fb1fb..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-071.expected +++ /dev/null @@ -1,15 +0,0 @@ -location: clients/tests/test-client.py:689:test_003()/71 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con -lang: C -returncode: 0 -stdout: 156 bytes ->>> -UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-072.expected b/clients/tests/test-client.check-on-disk/test_003-072.expected deleted file mode 100644 index 63fb19a8e1..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-072.expected +++ /dev/null @@ -1,15 +0,0 @@ -location: clients/tests/test-client.py:689:test_003()/72 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 156 bytes ->>> -UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-073.expected b/clients/tests/test-client.check-on-disk/test_003-073.expected deleted file mode 100644 index baa537e956..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-073.expected +++ /dev/null @@ -1,15 +0,0 @@ -location: clients/tests/test-client.py:689:test_003()/73 -cmd: $NMCLI -f UUID,TYPE --mode tabular --terse con -lang: de_DE.utf8 -returncode: 0 -stdout: 156 bytes ->>> -UUID-ethernet-REPLACED-REPLACED-REPL:802-3-ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d:802-3-ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA:802-3-ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-074.expected b/clients/tests/test-client.check-on-disk/test_003-074.expected deleted file mode 100644 index 79b5361f8a..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-074.expected +++ /dev/null @@ -1,20 +0,0 @@ -location: clients/tests/test-client.py:692:test_003()/74 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con -lang: C -returncode: 0 -stdout: 394 bytes ->>> -====================================== - NetworkManager connection profiles -====================================== -UUID TYPE --------------------------------------------------------------------------------------- -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-075.expected b/clients/tests/test-client.check-on-disk/test_003-075.expected deleted file mode 100644 index b04e475532..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-075.expected +++ /dev/null @@ -1,20 +0,0 @@ -location: clients/tests/test-client.py:692:test_003()/75 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 414 bytes ->>> -========================================== - Profile połączeń usługi NetworkManager -========================================== -UUID TYPE ------------------------------------------------------------------------------------------- -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-076.expected b/clients/tests/test-client.check-on-disk/test_003-076.expected deleted file mode 100644 index be70034612..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-076.expected +++ /dev/null @@ -1,20 +0,0 @@ -location: clients/tests/test-client.py:692:test_003()/76 -cmd: $NMCLI -f UUID,TYPE --mode tabular --pretty con -lang: de_DE.utf8 -returncode: 0 -stdout: 390 bytes ->>> -===================================== - NetworkManager Verbindungsprofile -===================================== -UUID TYPE -------------------------------------------------------------------------------------- -UUID-ethernet-REPLACED-REPLACED-REPL ethernet -5fcfd6d7-1e63-3332-8826-a7eda103792d ethernet -UUID-con-xx1-REPLACED-REPLACED-REPLA ethernet - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-077.expected b/clients/tests/test-client.check-on-disk/test_003-077.expected deleted file mode 100644 index 6b0213b491..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-077.expected +++ /dev/null @@ -1,115 +0,0 @@ -location: clients/tests/test-client.py:695:test_003()/77 -cmd: $NMCLI con s ethernet -lang: C -returncode: 0 -stdout: 4848 bytes ->>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: yes -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: no -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: unknown -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: no -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: no -ipv4.ignore-auto-dns: no -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: yes -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: no -ipv4.may-fail: yes -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: no -ipv6.ignore-auto-dns: no -ipv6.never-default: no -ipv6.may-fail: yes -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: yes -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: no -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: deactivating -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: no -GENERAL.DEFAULT6: no -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: no -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-078.expected b/clients/tests/test-client.check-on-disk/test_003-078.expected deleted file mode 100644 index d8df8f8cef..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-078.expected +++ /dev/null @@ -1,115 +0,0 @@ -location: clients/tests/test-client.py:695:test_003()/78 -cmd: $NMCLI con s ethernet -lang: pl_PL.UTF-8 -returncode: 0 -stdout: 4872 bytes ->>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -connection.stable-id: -- -connection.type: 802-3-ethernet -connection.interface-name: -- -connection.autoconnect: tak -connection.autoconnect-priority: 0 -connection.autoconnect-retries: -1 (default) -connection.auth-retries: -1 -connection.timestamp: 0 -connection.read-only: nie -connection.permissions: -- -connection.zone: -- -connection.master: -- -connection.slave-type: -- -connection.autoconnect-slaves: -1 (default) -connection.secondaries: -- -connection.gateway-ping-timeout: 0 -connection.metered: nieznane -connection.lldp: default -connection.mdns: -1 (default) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nie -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: automatyczne -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nie -ipv4.ignore-auto-dns: nie -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: tak -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nie -ipv4.may-fail: tak -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nie -ipv6.ignore-auto-dns: nie -ipv6.never-default: nie -ipv6.may-fail: tak -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: tak -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nie -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: deactivating -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: nie -GENERAL.DEFAULT6: nie -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nie -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.check-on-disk/test_003-079.expected b/clients/tests/test-client.check-on-disk/test_003-079.expected deleted file mode 100644 index a73b5f810d..0000000000 --- a/clients/tests/test-client.check-on-disk/test_003-079.expected +++ /dev/null @@ -1,115 +0,0 @@ -location: clients/tests/test-client.py:695:test_003()/79 -cmd: $NMCLI con s ethernet -lang: de_DE.utf8 -returncode: 0 -stdout: 4875 bytes ->>> -connection.id: ethernet -connection.uuid: UUID-ethernet-REPLACED-REPLACED-REPL -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) -802-3-ethernet.port: -- -802-3-ethernet.speed: 0 -802-3-ethernet.duplex: -- -802-3-ethernet.auto-negotiate: nein -802-3-ethernet.mac-address: -- -802-3-ethernet.cloned-mac-address: -- -802-3-ethernet.generate-mac-address-mask:-- -802-3-ethernet.mac-address-blacklist: -- -802-3-ethernet.mtu: auto -802-3-ethernet.s390-subchannels: -- -802-3-ethernet.s390-nettype: -- -802-3-ethernet.s390-options: -- -802-3-ethernet.wake-on-lan: default -802-3-ethernet.wake-on-lan-password: -- -ipv4.method: auto -ipv4.dns: -- -ipv4.dns-search: -- -ipv4.dns-options: "" -ipv4.dns-priority: 0 -ipv4.addresses: -- -ipv4.gateway: -- -ipv4.routes: -- -ipv4.route-metric: -1 -ipv4.route-table: 0 (unspec) -ipv4.ignore-auto-routes: nein -ipv4.ignore-auto-dns: nein -ipv4.dhcp-client-id: -- -ipv4.dhcp-timeout: 0 (default) -ipv4.dhcp-send-hostname: ja -ipv4.dhcp-hostname: -- -ipv4.dhcp-fqdn: -- -ipv4.never-default: nein -ipv4.may-fail: ja -ipv4.dad-timeout: -1 (default) -ipv6.method: auto -ipv6.dns: -- -ipv6.dns-search: -- -ipv6.dns-options: "" -ipv6.dns-priority: 0 -ipv6.addresses: -- -ipv6.gateway: -- -ipv6.routes: -- -ipv6.route-metric: -1 -ipv6.route-table: 0 (unspec) -ipv6.ignore-auto-routes: nein -ipv6.ignore-auto-dns: nein -ipv6.never-default: nein -ipv6.may-fail: ja -ipv6.ip6-privacy: -1 (unknown) -ipv6.addr-gen-mode: stable-privacy -ipv6.dhcp-send-hostname: ja -ipv6.dhcp-hostname: -- -ipv6.token: -- -proxy.method: none -proxy.browser-only: nein -proxy.pac-url: -- -proxy.pac-script: -- -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth0 -GENERAL.STATE: deactivating -GENERAL.DEFAULT: nein -GENERAL.DEFAULT6: nein -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nein -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/1 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -GENERAL.NAME: ethernet -GENERAL.UUID: UUID-ethernet-REPLACED-REPLACED-REPL -GENERAL.DEVICES: eth1 -GENERAL.STATE: activated -GENERAL.DEFAULT: nein -GENERAL.DEFAULT6: nein -GENERAL.SPEC-OBJECT: -- -GENERAL.VPN: nein -GENERAL.DBUS-PATH: /org/freedesktop/NetworkManager/ActiveConnection/2 -GENERAL.CON-PATH: /org/freedesktop/NetworkManager/Settings/Connection/3 -GENERAL.ZONE: -- -GENERAL.MASTER-PATH: -- - -<<< -stderr: 0 bytes ->>> - -<<< diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index a64d678825..f2e096644b 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -312,7 +312,7 @@ class TestNmcli(NmTestBase): sort_lines_stdout = False, extra_env = None): frame = sys._getframe(1) - for lang in [ 'C', 'pl', 'de' ]: + for lang in [ 'C', 'pl' ]: self._call_nmcli(args, lang, check_on_disk,