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' } )
This commit is contained in:
Thomas Haller
2018-05-15 14:21:00 +02:00
parent 869009ab11
commit ea1830a429
79 changed files with 88 additions and 80 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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)