about summary refs log tree commit diff
path: root/src/core/platform
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-02-22 17:22:03 +0100
committerMichael Biebl <biebl@debian.org>2024-02-22 17:22:03 +0100
commitee7b97d8af11fb1c2cbcd4df0deb298ff906fa8b (patch)
treeb0978e9f3ed4e2e9b727844e57637783ca47a8ef /src/core/platform
parentd8ad0e3c21e712308cf070716acc421adfabd7d3 (diff)
parentbba2e4b4de668db525cbfdfc35292e5a0b51671a (diff)
Update upstream source from tag 'upstream/1.46.0'
Update to upstream version '1.46.0'
with Debian dir 8c30a24f4e6f4278d9943aef82e6ae63c4528df5
Diffstat (limited to 'src/core/platform')
-rw-r--r--src/core/platform/tests/test-link.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/platform/tests/test-link.c b/src/core/platform/tests/test-link.c
index 205559ce..1d0bfdbe 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);