fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-03 18:20:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli/tests: avoid duplicate --terse option in tests

Browse source 
These nmcli calls are inside a Util.iter_nmcli_output_modes()
loop, hence, --terse will passed to them already.

Specifying --terse more than once, causes nmcli to fail.
We didn't actually want to test how nmcli rejects such
duplicate arguments. Adjust the test.
This commit is contained in:
Thomas Haller 2018-07-24 09:51:10 +02:00
parent f0ceb3f393
commit 4d435ee92a
2 changed files with 3758 additions and 1354 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5108
clients/tests/test-client.check-on-disk/test_004.expected
View file

File diff suppressed because it is too large Load diff

4
clients/tests/test-client.py
View file

@ -1003,7 +1003,7 @@ class TestNmcli(NmTestBase):
self.call_nmcli_l(mode + ['con', 's', 'con-vpn-1'],
replace_stdout = replace_stdout)
self.call_nmcli_l(mode + ['-t', 'con', 's', 'con-vpn-1'],
self.call_nmcli_l(mode + ['con', 's', 'con-vpn-1'],
replace_stdout = replace_stdout)
self.call_nmcli_l(mode + ['-f', 'ALL', 'con', 's', 'con-vpn-1'],
@ -1039,7 +1039,7 @@ class TestNmcli(NmTestBase):
self.call_nmcli_l(mode + ['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', 'dev', 'show', 'wlan0'],
replace_stdout = replace_stdout)
self.call_nmcli_l(mode + ['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', '-t', 'dev', 'show', 'wlan0'],
self.call_nmcli_l(mode + ['-f', 'GENERAL,GENERAL.HWADDR,WIFI-PROPERTIES', 'dev', 'show', 'wlan0'],
replace_stdout = replace_stdout)
self.call_nmcli_l(mode + ['-f', 'DEVICE,TYPE,DBUS-PATH', 'dev'],