From d424de10bf6d2228d36dadf3568a74a3e505e647 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 15 May 2018 16:20:00 +0200 Subject: [PATCH] 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 f439652a0..53d0290fe 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 74a3e21a4..eb423567f 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 481785933..bb033632e 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 a7d604cf2..bb513a735 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 75f8b9561..b08584ac0 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 ac49bb1c8..7b0ff9123 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 39bb04c3c..06ecc70a7 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 3ece98808..0c919875c 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 3973dde1d..562588cf0 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 7b6c32d42..79efe062d 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 182191a65..d220cfb43 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 367cc1846..440ec6073 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 266fb1dc2..7dc32b013 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 42ab10b8b..65ed20d1c 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 d2cd4203c..ce265b6c3 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 04141802f..7da578760 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 73e028b95..25b954c33 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 3ccedade3..46f92e87f 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 9d33e7477..821c1b185 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 1128fb267..23f3d8563 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 e3b132161..065147a70 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 c2dbfd4be..6edba3afd 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 001d45399..60b450f83 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 8edda8461..cf151638f 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 a2261cf2c..60879e2c5 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 c7d322fea..c78b7ac65 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 3f03f76dc..5c54169ee 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 06f74b2ed..c7df39be0 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 c7728ca27..8d09ae7f6 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 20507aa66..23d3cd236 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 01876995a..c0aff64f6 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 212f99a8e..b9f9825f1 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 d52ad2de6..20fd56fb2 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 b48011dd3..33e04d190 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 5973b9a35..115ce69c4 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 67fbb0b82..84f11a4a9 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 f0ff60da3..9d007d6a1 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 0e28e9737..f4fb3ee11 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 49d2569f2..e1cbb8d68 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 48ed78797..776f9b9ee 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 8dc2ffd97..52e1a8358 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 c80843650..9ac49f07d 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 e98814e6b..75d1a7d90 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 a77fedab4..caf7e395a 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 b61676743..51f828dfb 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 bfcf4ceb1..50d713d0d 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 bc5b468cf..8c84e5689 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 1ec82a91f..5ed52474a 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 b012f820f..d4d4fb841 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 4703b7768..1d7edd992 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 a27056518..4d2ca109e 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 e215769fe..079dbc7f8 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 f37dd9e29..7035c3e94 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 c077a6846..01960ad8d 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 9fbb51e64..867738c96 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 09132397c..e72450eab 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 17eeb70b8..6edd4b00a 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 d15bc3a95..0698d3a9d 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 4f74030f2..f89b14b82 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 1223b93e4..407742902 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 72e2b6289..a8fbb9ff1 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 c4ddaecd9..6708eb38d 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 ac447c04c..a25784195 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 047da0980..2cadf2c71 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 0cf9978d5..9dc45ff69 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 c292cd5b1..d4f3ab9f1 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 5c71907fd..0cd1711c8 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 7d2443a7f..47e8ceba3 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 f89f5c386..704ceb599 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 bcfda75db..513dc8a1a 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 7a1d42faa..a188ae846 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 14d323b66..fb2f4b689 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 0346ccfde..8aedcaf97 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 0eeee627d..b299c60f8 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 1038611d7..1219d2034 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 f4a92c53b..8162c9943 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 9ac647976..6e7e0a50a 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 6d6102114..0ab4cb68a 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 9745dd08d..04035d2c9 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 0dd7ee606..53304af3d 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 8c8cb10fb..b2c0e334c 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 45679c36a..596ad5c3a 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 4efb855ea..419d6360d 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 309b1682c..e62faecc6 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 052a6f49f..a234a7e60 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 d4221df50..3b84da32e 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 c395ba9c9..acb1721d0 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 d91d642bb..df96e4992 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 92d80da3d..b0fb5cf4e 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 73dd00f63..a26f7a400 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 a166dc84a..e9f3d6387 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 2e392c2d0..9e97da426 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 4dbccdad8..ae5d163ef 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 e4737e93c..f78eb84ca 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 6c4451189..eaddf1102 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 1fe6ed0c4..863bc01e2 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 5fe88c05d..dd52b8fde 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 bfd9eaab9..b30089138 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 ca4c494af..c1fd9e1d3 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 2ac807aa7..2e3eb1519 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 eec707d27..8197d80c4 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 cb045c13a..9b4d3c8c2 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())