mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 14:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: make netclientclock test faster and less flaky

Browse source
This commit is contained in:
Tim-Philipp Müller 2014-03-23 12:53:55 +00:00
parent 533548529b
commit 4ab09ee869
1 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/check/libs/gstnetclientclock.c
View file

@ -51,8 +51,8 @@ GST_START_TEST (test_functioning)
GstNetTimeProvider *ntp; GstNetTimeProvider *ntp;
GstClock *client, *server; GstClock *client, *server;
GstClockTime basex, basey, rate_num, rate_denom; GstClockTime basex, basey, rate_num, rate_denom;
GstClockTime servtime, clienttime; GstClockTime servtime, clienttime, diff;
gint port; gint port, i;
server = gst_system_clock_obtain (); server = gst_system_clock_obtain ();
fail_unless (server != NULL, "failed to get system clock"); fail_unless (server != NULL, "failed to get system clock");
@ -73,22 +73,38 @@ GST_START_TEST (test_functioning)
g_object_get (client, "port", &port, NULL); g_object_get (client, "port", &port, NULL);
/* let the clocks synchronize */ /* let the clocks synchronize */
g_usleep (G_USEC_PER_SEC); for (i = 0; i < 11; ++i) {
gchar sign;
servtime = gst_clock_get_time (server); servtime = gst_clock_get_time (server);
clienttime = gst_clock_get_time (client); clienttime = gst_clock_get_time (client);
if (servtime > clienttime) {
sign = '-';
diff = servtime - clienttime;
} else {
sign = '+';
diff = clienttime - servtime;
}
GST_LOG ("server time: %" GST_TIME_FORMAT, GST_TIME_ARGS (servtime));
GST_LOG ("client time: %" GST_TIME_FORMAT, GST_TIME_ARGS (clienttime));
GST_LOG ("diff : %c%" GST_TIME_FORMAT, sign, GST_TIME_ARGS (diff));
/* can't in general make a precise assertion here, because this depends on /* can't in general make a precise assertion here, because this depends on
* system load and a lot of things. however within half a second they should * system load and a lot of things. however within half a second they should
* at least be within 1/10 of a second of each other... */ * at least be within 1/10 of a second of each other... */
if (servtime > clienttime) if (diff < 100 * GST_MSECOND)
fail_unless (servtime - clienttime < 100 * GST_MSECOND, break;
"clocks not in sync (%" GST_TIME_FORMAT ")",
GST_TIME_ARGS (servtime - clienttime)); g_usleep (G_USEC_PER_SEC / 20);
else }
fail_unless (clienttime - servtime < 100 * GST_MSECOND,
"clocks not in sync (%" GST_TIME_FORMAT ")", GST_INFO ("done after %d iterations, diff: %" GST_TIME_FORMAT, i,
GST_TIME_ARGS (clienttime - servtime)); GST_TIME_ARGS (diff));
if (diff > 100 * GST_MSECOND)
fail ("clocks not in sync (%" GST_TIME_FORMAT ")", diff);
/* /*
g_print ("diff: %" GST_TIME_FORMAT, g_print ("diff: %" GST_TIME_FORMAT,