colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

platform/tests: add @expected_link_type to nmtstp_wait_for_link()

Browse Source
This commit is contained in:
Thomas Haller
2015-11-24 15:56:06 +01:00
parent f122879c83
commit d72fe89899
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/platform/tests/test-common.c
View File

@@ -367,13 +367,13 @@ nmtstp_wait_for_signal_until (gint64 until_ms)
} }
const NMPlatformLink * const NMPlatformLink *
nmtstp_wait_for_link (const char *ifname, guint timeout_ms) nmtstp_wait_for_link (const char *ifname, NMLinkType expected_link_type, guint timeout_ms)
{ {
return nmtstp_wait_for_link_until (ifname, nm_utils_get_monotonic_timestamp_ms () + timeout_ms); return nmtstp_wait_for_link_until (ifname, expected_link_type, nm_utils_get_monotonic_timestamp_ms () + timeout_ms);
} }
const NMPlatformLink * const NMPlatformLink *
nmtstp_wait_for_link_until (const char *ifname, gint64 until_ms) nmtstp_wait_for_link_until (const char *ifname, NMLinkType expected_link_type, gint64 until_ms)
{ {
const NMPlatformLink *plink; const NMPlatformLink *plink;
gint64 now; gint64 now;
@@ -382,7 +382,8 @@ nmtstp_wait_for_link_until (const char *ifname, gint64 until_ms)
now = nm_utils_get_monotonic_timestamp_ms (); now = nm_utils_get_monotonic_timestamp_ms ();
plink = nm_platform_link_get_by_ifname (NM_PLATFORM_GET, ifname); plink = nm_platform_link_get_by_ifname (NM_PLATFORM_GET, ifname);
if (plink) if ( plink
&& (expected_link_type == NM_LINK_TYPE_NONE || plink->type == expected_link_type))
return plink; return plink;
if (until_ms < now) if (until_ms < now)
@@ -403,10 +404,8 @@ nmtstp_assert_wait_for_link_until (const char *ifname, NMLinkType expected_link_
{ {
const NMPlatformLink *plink; const NMPlatformLink *plink;
plink = nmtstp_wait_for_link_until (ifname, until_ms); plink = nmtstp_wait_for_link_until (ifname, expected_link_type, until_ms);
g_assert (plink); g_assert (plink);
if (expected_link_type != NM_LINK_TYPE_NONE)
g_assert_cmpint (plink->type, ==, expected_link_type);
return plink; return plink;
} }

4
src/platform/tests/test-common.h
View File

@@ -75,8 +75,8 @@ int nmtstp_run_command (const char *format, ...) __attribute__((__format__ (__pr
gboolean nmtstp_wait_for_signal (guint timeout_ms); gboolean nmtstp_wait_for_signal (guint timeout_ms);
gboolean nmtstp_wait_for_signal_until (gint64 until_ms); gboolean nmtstp_wait_for_signal_until (gint64 until_ms);
const NMPlatformLink *nmtstp_wait_for_link (const char *ifname, guint timeout_ms); const NMPlatformLink *nmtstp_wait_for_link (const char *ifname, NMLinkType expected_link_type, guint timeout_ms);
const NMPlatformLink *nmtstp_wait_for_link_until (const char *ifname, gint64 until_ms); const NMPlatformLink *nmtstp_wait_for_link_until (const char *ifname, NMLinkType expected_link_type, gint64 until_ms);
const NMPlatformLink *nmtstp_assert_wait_for_link (const char *ifname, NMLinkType expected_link_type, guint timeout_ms); const NMPlatformLink *nmtstp_assert_wait_for_link (const char *ifname, NMLinkType expected_link_type, guint timeout_ms);
const NMPlatformLink *nmtstp_assert_wait_for_link_until (const char *ifname, NMLinkType expected_link_type, gint64 until_ms); const NMPlatformLink *nmtstp_assert_wait_for_link_until (const char *ifname, NMLinkType expected_link_type, gint64 until_ms);