From a03a33c45125715211d4883d58ef61c0cbe2bc3b Mon Sep 17 00:00:00 2001 From: liningjie Date: Fri, 8 Nov 2024 22:21:08 +0800 Subject: [PATCH] test: disable vlan_xgress unit test --- NetworkManager.spec | 9 ++- ...t-test-disable-vlan_xgress-unit-test.patch | 78 +++++++++++++++++++ 2 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 backport-test-disable-vlan_xgress-unit-test.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 5d536f1..46c66d9 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -51,7 +51,7 @@ Name: NetworkManager Version: 1.44.2 Epoch: 1 -Release: 2 +Release: 3 Summary: 4 License: GPLv2+ URL: https://networkmanager.dev/ @@ -64,6 +64,7 @@ Patch3: bugfix-recover-to-30s-timeout-in-NetworkManager-wait-online.pa Patch4: NetworkManager-Add-sw64-architecture.patch Patch5: delete-lease-file-when-connection-deleted.patch Patch6: 0001-add-NM-to-support-wifi6.patch +Patch7: backport-test-disable-vlan_xgress-unit-test.patch BuildRequires: gcc libtool pkgconfig automake autoconf intltool gettext-devel ppp-devel gnutls-devel BuildRequires: dbus-devel glib2-devel gobject-introspection-devel jansson-devel @@ -548,6 +549,12 @@ fi %{_datadir}/gtk-doc/html/NetworkManager/* %changelog +* Fri Nov 8 2024 liningjie - 1:1.44.2-3 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:test: disable vlan_xgress unit test + * Tue Apr 9 2024 liuzhilin - 1:1.44.2-2 - add NM to support wifi6(fix dde-network-core build error) - Type:requirement diff --git a/backport-test-disable-vlan_xgress-unit-test.patch b/backport-test-disable-vlan_xgress-unit-test.patch new file mode 100644 index 0000000..1569599 --- /dev/null +++ b/backport-test-disable-vlan_xgress-unit-test.patch @@ -0,0 +1,78 @@ +From 6e30e37ebe78f17561befafc7ccf917d6c3b5065 Mon Sep 17 00:00:00 2001 +From: Stanislas FAYE +Date: Thu, 22 Feb 2024 12:29:12 +0100 +Subject: [PATCH] test: disable vlan_xgress unit test + +Disable the vlan_xgress unit test which was failing. +This test is currently being work and is going to be fixed soon. +--- + src/core/platform/tests/test-link.c | 12 +++++------- + 1 file changed, 5 insertions(+), 7 deletions(-) + +diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c +index 205559ceb1..1d0bfdbe13 100644 +--- a/src/core/platform/tests/test-link.c ++++ b/src/core/platform/tests/test-link.c +@@ -2263,7 +2263,7 @@ test_software_detect_add(const char *testpath, NMLinkType link_type, int test_mo + } + + /*****************************************************************************/ +- ++/* + static void + _assert_xgress_qos_mappings_impl(int ifindex, gboolean is_ingress_map, int n_entries, int n, ...) + { +@@ -2343,7 +2343,8 @@ _assert_vlan_flags(int ifindex, _NMVlanFlags flags) + g_assert(plnk); + g_assert_cmpint(plnk->flags, ==, flags); + } +- ++*/ ++/* + static void + test_vlan_set_xgress(void) + { +@@ -2359,7 +2360,6 @@ test_vlan_set_xgress(void) + ifindex = + nmtstp_assert_wait_for_link(NM_PLATFORM_GET, DEVICE_NAME, NM_LINK_TYPE_VLAN, 100)->ifindex; + +- /* ingress-qos-map */ + + g_assert(nm_platform_link_vlan_set_ingress_map(NM_PLATFORM_GET, ifindex, 4, 5)); + _assert_ingress_qos_mappings(ifindex, 1, 4, 5); +@@ -2385,14 +2385,12 @@ test_vlan_set_xgress(void) + g_assert(nm_platform_link_vlan_set_ingress_map(NM_PLATFORM_GET, ifindex, 0, 5)); + _assert_ingress_qos_mappings(ifindex, 3, 0, 5, 3, 8, 4, 5); + +- /* Set invalid values: */ + g_assert(nm_platform_link_vlan_set_ingress_map(NM_PLATFORM_GET, ifindex, 8, 3)); + _assert_ingress_qos_mappings(ifindex, 3, 0, 5, 3, 8, 4, 5); + + g_assert(nm_platform_link_vlan_set_ingress_map(NM_PLATFORM_GET, ifindex, 9, 4)); + _assert_ingress_qos_mappings(ifindex, 3, 0, 5, 3, 8, 4, 5); + +- /* egress-qos-map */ + + g_assert(nm_platform_link_vlan_set_egress_map(NM_PLATFORM_GET, ifindex, 7, 3)); + _assert_egress_qos_mappings(ifindex, 1, 7, 3); +@@ -2695,7 +2693,7 @@ test_vlan_set_xgress(void) + nmtstp_link_delete(NULL, -1, ifindex, DEVICE_NAME, TRUE); + nmtstp_link_delete(NULL, -1, ifindex_parent, PARENT_NAME, TRUE); + } +- ++*/ + /*****************************************************************************/ + + static void +@@ -4109,7 +4107,7 @@ _nmtstp_setup_tests(void) + test_software_detect_add("/link/software/detect/wireguard/1", NM_LINK_TYPE_WIREGUARD, 1); + test_software_detect_add("/link/software/detect/wireguard/2", NM_LINK_TYPE_WIREGUARD, 2); + +- g_test_add_func("/link/software/vlan/set-xgress", test_vlan_set_xgress); ++ // g_test_add_func("/link/software/vlan/set-xgress", test_vlan_set_xgress); + + g_test_add_func("/link/set-properties", test_link_set_properties); + +-- +2.43.0 + -- Gitee