mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-09 05:58:01 +02:00
platform/test: reenable xgress qos tests
Fixes:6e30e37ebe('test: disable vlan_xgress unit test') (cherry picked from commit4107a6883f) (cherry picked from commit0eb1781b6c) (cherry picked from commit779fd8deae)
This commit is contained in:
parent
e6dc4332f3
commit
5d7173a5ea
1 changed files with 4 additions and 7 deletions
|
|
@ -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,8 +2343,7 @@ _assert_vlan_flags(int ifindex, _NMVlanFlags flags)
|
|||
g_assert(plnk);
|
||||
g_assert_cmpint(plnk->flags, ==, flags);
|
||||
}
|
||||
*/
|
||||
/*
|
||||
|
||||
static void
|
||||
test_vlan_set_xgress(void)
|
||||
{
|
||||
|
|
@ -2360,7 +2359,6 @@ test_vlan_set_xgress(void)
|
|||
ifindex =
|
||||
nmtstp_assert_wait_for_link(NM_PLATFORM_GET, DEVICE_NAME, NM_LINK_TYPE_VLAN, 100)->ifindex;
|
||||
|
||||
|
||||
g_assert(nm_platform_link_vlan_set_ingress_map(NM_PLATFORM_GET, ifindex, 4, 5));
|
||||
_assert_ingress_qos_mappings(ifindex, 1, 4, 5);
|
||||
|
||||
|
|
@ -2391,7 +2389,6 @@ test_vlan_set_xgress(void)
|
|||
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);
|
||||
|
||||
|
||||
g_assert(nm_platform_link_vlan_set_egress_map(NM_PLATFORM_GET, ifindex, 7, 3));
|
||||
_assert_egress_qos_mappings(ifindex, 1, 7, 3);
|
||||
|
||||
|
|
@ -2693,7 +2690,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
|
||||
|
|
@ -4107,7 +4104,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);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue