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' } )

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)