luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-02 07:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDateTime test: fix occasional failures

Browse Source 
We were using the time() library call to get the current time from the
system in order to compare it to the time returned by
g_date_time_new_now().

Of course, we took care to ensure that the time (in seconds) didn't
change in the middle of this process by checking the before and after
value of the system time.

Unfortunately, the system time as measured by time() was being taken
from a less-accurate clock source than the time used by GDateTime.  As a
result, we could have GDateTime already into the next second while the
"seconds" value of the time returned by time() was still in the last
one, even when checked "after".

Avoid the problem by using the same ultimate source for time --
g_get_real_time().

This is based on a similar patch from Iain Lane, but it uses
g_get_real_time() instead of g_get_current_time().

https://bugzilla.gnome.org/show_bug.cgi?id=754994
This commit is contained in:
Ryan Lortie 2015-10-15 15:14:36 +01:00
parent 75eaf5091c
commit 419f57137a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glib/tests/gdatetime.c
View File

@ -79,14 +79,14 @@ test_GDateTime_now (void)
* to guard against that. */
do
{
before = time (NULL);
before = g_get_real_time () / G_TIME_SPAN_SECOND;
memset (&tm, 0, sizeof (tm));
get_localtime_tm (before, &tm);
dt = g_date_time_new_now_local ();
after = time (NULL);
after = g_get_real_time () / G_TIME_SPAN_SECOND;
}
while (before != after);
@ -672,7 +672,7 @@ test_GDateTime_now_utc (void)
* to guard against that. */
do
{
t = time (NULL);
t = g_get_real_time () / G_TIME_SPAN_SECOND;
#ifdef HAVE_GMTIME_R
gmtime_r (&t, &tm);
#else
@ -687,7 +687,7 @@ test_GDateTime_now_utc (void)
#endif
dt = g_date_time_new_now_utc ();
after = time (NULL);
after = g_get_real_time () / G_TIME_SPAN_SECOND;
}
while (t != after);
@ -733,7 +733,7 @@ test_GDateTime_get_utc_offset (void)
struct tm tm;
memset (&tm, 0, sizeof (tm));
get_localtime_tm (time (NULL), &tm);
get_localtime_tm (g_get_real_time () / G_TIME_SPAN_SECOND, &tm);
dt = g_date_time_new_now_local ();
ts = g_date_time_get_utc_offset (dt);
@ -776,12 +776,12 @@ test_GDateTime_to_local (void)
* to guard against that. */
do
{
before = time (NULL);
before = g_get_real_time () / G_TIME_SPAN_SECOND;
g_clear_pointer (&utc, g_date_time_unref);
g_clear_pointer (&now, g_date_time_unref);
utc = g_date_time_new_now_utc ();
now = g_date_time_new_now_local ();
after = time (NULL);
after = g_get_real_time () / G_TIME_SPAN_SECOND;
}
while (before != after);