fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-19 19:30:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test/trivial: rename ASSERT_nmp_cache_is_consistent() function to nmtst_assert_nmp_cache_is_consistent()

Browse source 
We sometimes expose test-only functions as part of our API, to give direct
access to unit tests. Such functions should have a "NMTST" prefix. Rename.
This commit is contained in:
Thomas Haller 2020-10-05 15:46:19 +02:00
parent f2b5812af3
commit 0d7bf62aac
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/platform/nmp-object.c
View file

@ -3058,7 +3058,7 @@ nmp_cache_free(NMPCache *cache)
/*****************************************************************************/
void
ASSERT_nmp_cache_is_consistent(const NMPCache *cache)
nmtst_assert_nmp_cache_is_consistent(const NMPCache *cache)
{}
/*****************************************************************************/

2
src/platform/nmp-object.h
View file

@ -812,7 +812,7 @@ const NMPObject *nmp_cache_link_connected_needs_toggle_by_ifindex(const NMPCache
gboolean nmp_cache_use_udev_get(const NMPCache *cache);
void ASSERT_nmp_cache_is_consistent(const NMPCache *cache);
void nmtst_assert_nmp_cache_is_consistent(const NMPCache *cache);
NMPCacheOpsType nmp_cache_remove(NMPCache * cache,
const NMPObject * obj_needle,

20
src/platform/tests/test-nmp-object.c
View file

@ -272,7 +272,7 @@ test_cache_link(void)
g_assert(NMP_OBJECT_UP_CAST(&objm1->object) == objm1);
g_assert(!nmp_object_is_alive(objm1));
_nmp_cache_update_netlink(cache, objm1, &obj_old, &obj_new, NMP_CACHE_OPS_UNCHANGED);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
g_assert(!obj_old);
g_assert(!obj_new);
g_assert(!nmp_cache_lookup_obj(cache, objm1));
@ -284,7 +284,7 @@ test_cache_link(void)
objm1->_link.netlink.is_in_netlink = TRUE;
g_assert(nmp_object_is_alive(objm1));
_nmp_cache_update_netlink(cache, objm1, &obj_old, &obj_new, NMP_CACHE_OPS_ADDED);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
g_assert(!obj_old);
g_assert(obj_new);
g_assert(objm1 == obj_new);
@ -303,7 +303,7 @@ test_cache_link(void)
objm1->_link.netlink.is_in_netlink = TRUE;
g_assert(nmp_object_is_alive(objm1));
_nmp_cache_update_netlink(cache, objm1, &obj_old, &obj_new, NMP_CACHE_OPS_UNCHANGED);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
g_assert(obj_old);
g_assert(obj_new);
g_assert(obj_new != objm1);
@ -319,7 +319,7 @@ test_cache_link(void)
objm1 = nmp_object_new(NMP_OBJECT_TYPE_LINK, (NMPlatformObject *) &pl_link_2);
g_assert(!nmp_object_is_alive(objm1));
_nmp_cache_update_netlink(cache, objm1, &obj_old, &obj_new, NMP_CACHE_OPS_REMOVED);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
g_assert(obj_old);
g_assert(!obj_new);
g_assert(!nmp_cache_lookup_obj(cache, objm1));
@ -332,7 +332,7 @@ test_cache_link(void)
/* now add the link only with aspect UDEV. */
ops_type =
nmp_cache_update_link_udev(cache, pl_link_2.ifindex, udev_device_2, &obj_old, &obj_new);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
g_assert_cmpint(ops_type, ==, NMP_CACHE_OPS_ADDED);
g_assert(!obj_old);
g_assert(obj_new);
@ -354,7 +354,7 @@ test_cache_link(void)
&obj_old,
&obj_new,
udev_device_2 ? NMP_CACHE_OPS_UPDATED : NMP_CACHE_OPS_ADDED);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
if (udev_device_2) {
g_assert(obj_old);
g_assert(!nmp_object_is_visible(obj_old));
@ -380,7 +380,7 @@ test_cache_link(void)
&obj_old,
&obj_new,
udev_device_2 ? NMP_CACHE_OPS_UPDATED : NMP_CACHE_OPS_REMOVED);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
if (udev_device_2)
g_assert(obj_new == objm1);
else
@ -413,7 +413,7 @@ test_cache_link(void)
ops_type =
nmp_cache_update_link_udev(cache, pl_link_3.ifindex, udev_device_3, &obj_old, &obj_new);
g_assert_cmpint(ops_type, ==, NMP_CACHE_OPS_ADDED);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
g_assert(NMP_OBJECT_IS_VALID(obj_new));
g_assert(!obj_old);
g_assert(!nmp_object_is_visible(obj_new));
@ -431,7 +431,7 @@ test_cache_link(void)
objm1->_link.netlink.is_in_netlink = TRUE;
g_assert(nmp_object_is_alive(objm1));
_nmp_cache_update_netlink(cache, objm1, &obj_old, &obj_new, NMP_CACHE_OPS_UPDATED);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
g_assert(obj_old);
g_assert(obj_new == objm1);
g_assert(nmp_object_equal(objm1, obj_new));
@ -452,7 +452,7 @@ test_cache_link(void)
/* remove UDEV. */
ops_type = nmp_cache_update_link_udev(cache, pl_link_3.ifindex, NULL, &obj_old, &obj_new);
g_assert_cmpint(ops_type, ==, NMP_CACHE_OPS_UPDATED);
ASSERT_nmp_cache_is_consistent(cache);
nmtst_assert_nmp_cache_is_consistent(cache);
g_assert(obj_old && nmp_object_is_visible(obj_old));
g_assert(
nmp_cache_lookup_obj(cache, nmp_object_stackinit_id_link(&objs1, pl_link_3.ifindex))