From 964ae8cc391520440cf5aa13e2b9cc34850ea6c2 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Feb 2019 19:01:41 +0100 Subject: New upstream version 1.14.6 --- clients/tests/test-client.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clients/tests/test-client.py') diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index e8f1f7f2..d92d499c 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -744,8 +744,8 @@ class TestNmcli(NmTestBase): skip_test_for_l10n_diff.append(n['test_name']) continue print("\n\n\nThe file '%s' does not have the expected content:" % (filename)) - print("ACTUAL OUTPUT:\n[[%s]]\n" % (results_expect[i])) - print("EXPECT OUTPUT:\n[[%s]]\n" % (n['content'])) + print("ACTUAL OUTPUT:\n[[%s]]\n" % (n['content'])) + print("EXPECT OUTPUT:\n[[%s]]\n" % (results_expect[i])) print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1") print("See howto in %s for details.\n" % (PathConfiguration.canonical_script_filename())) self.fail("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename)) -- cgit 1.3.0-6-gf8a5 From 9a6dcbf895f9da01768e64b73cec88c16157d91e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 26 Mar 2019 23:25:23 +0100 Subject: New upstream version 1.16.0 --- clients/tests/test-client.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) (limited to 'clients/tests/test-client.py') diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index d92d499c..c7d5c958 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -7,7 +7,7 @@ from __future__ import print_function # This test starts NetworkManager stub service in a user D-Bus session, # and runs nmcli against it. The output is recorded and compared to a pre-generated # expected output (clients/tests/test-client.check-on-disk/*.expected) which -# is also commited to git. +# is also committed to git. # ############################################################################### # @@ -27,7 +27,7 @@ from __future__ import print_function # # $ LANG=pl_PL.UTF-8 ./clients/cli/nmcli --version # # also ensure that `locale -a` reports the Polish locale. # $ rm -rf clients/tests/test-client.check-on-disk/*.expected -# # (step seldomly required) +# # (step seldom required) # # Sometimes, if you want to be sure that the test would generate # # exactly the same .expected files, purge the previous version first. # # This is only necessary, when you remove test from this file. @@ -748,6 +748,7 @@ class TestNmcli(NmTestBase): print("EXPECT OUTPUT:\n[[%s]]\n" % (results_expect[i])) print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1") print("See howto in %s for details.\n" % (PathConfiguration.canonical_script_filename())) + sys.stdout.flush() self.fail("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename)) if len(results_expect) != len(results): if not regenerate: @@ -758,6 +759,7 @@ class TestNmcli(NmTestBase): print("EXPECT OUTPUT:\n[[%s]]\n" % (results_expect[len(results)])) print("Let the test write the file by rerunning with NM_TEST_REGENERATE=1") print("See howto in %s for details.\n" % (PathConfiguration.canonical_script_filename())) + sys.stdout.flush() self.fail("Unexpected output of command, expected %s. Rerun test with NM_TEST_REGENERATE=1 to regenerate files" % (filename)) if regenerate: @@ -805,11 +807,23 @@ class TestNmcli(NmTestBase): iface = 'wlan1') self.srv.op_AddObj('WifiAp', - device = 'wlan0') + device = 'wlan0', + rsnf = 0x0) + self.srv.op_AddObj('WifiAp', device = 'wlan0') + + NM_AP_FLAGS = getattr(NM, '80211ApSecurityFlags') + rsnf = 0x0 + rsnf = rsnf | NM_AP_FLAGS.PAIR_TKIP + rsnf = rsnf | NM_AP_FLAGS.PAIR_CCMP + rsnf = rsnf | NM_AP_FLAGS.GROUP_TKIP + rsnf = rsnf | NM_AP_FLAGS.GROUP_CCMP + rsnf = rsnf | NM_AP_FLAGS.KEY_MGMT_SAE self.srv.op_AddObj('WifiAp', - device = 'wlan0') + device = 'wlan0', + wpaf = 0x0, + rsnf = rsnf) self.srv.op_AddObj('WifiAp', device = 'wlan1') -- cgit 1.3.0-6-gf8a5 From 85563b7fc7ec2cd21e38debb9b28db342e2e8e7c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sun, 21 Apr 2019 21:09:51 +0200 Subject: New upstream version 1.18.0 --- clients/tests/test-client.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'clients/tests/test-client.py') diff --git a/clients/tests/test-client.py b/clients/tests/test-client.py index c7d5c958..08b0b951 100755 --- a/clients/tests/test-client.py +++ b/clients/tests/test-client.py @@ -589,6 +589,7 @@ class TestNmcli(NmTestBase): env['LIBNM_USE_SESSION_BUS'] = '1' env['LIBNM_USE_NO_UDEV'] = '1' env['TERM'] = 'linux' + env['ASAN_OPTIONS'] = 'detect_leaks=0' env['XDG_CONFIG_HOME'] = PathConfiguration.srcdir() if fatal_warnings is _DEFAULT_ARG or fatal_warnings: env['G_DEBUG'] = 'fatal-warnings' @@ -1097,6 +1098,9 @@ class TestNmcli(NmTestBase): self.call_nmcli_l(mode + ['-f', 'GENERAL,CAPABILITIES,WIFI-PROPERTIES,AP,WIRED-PROPERTIES,WIMAX-PROPERTIES,NSP,IP4,DHCP4,IP6,DHCP6,BOND,TEAM,BRIDGE,VLAN,BLUETOOTH,CONNECTIONS', 'device', 'show', 'wlan0' ], replace_stdout = replace_stdout) + self.call_nmcli_l(mode + ['dev', 'lldp', 'list', 'ifname', 'eth0'], + replace_stdout = replace_stdout) + ############################################################################### def main(): -- cgit 1.3.0-6-gf8a5