Merge authors: Dmitrijs Ledkovs (xnox) Related merge proposals: https://code.launchpad.net/~xnox/upstart/utmp-usleep/+merge/140490 proposed by: Dmitrijs Ledkovs (xnox) review: Approve - James Hunt (jamesodhunt) ------------------------------------------------------------ revno: 1417 [merge] committer: James Hunt <[email protected]> branch nick: upstart timestamp: Wed 2012-12-19 09:57:35 +0000 message: * Merge of lp:~xnox/upstart/utmp-usleep. modified: util/tests/test_sysv.c util/tests/test_utmp.c
-- lp:upstart https://code.launchpad.net/~upstart-devel/upstart/trunk Your team Upstart Reviewers is subscribed to branch lp:upstart. To unsubscribe from this branch go to https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'util/tests/test_sysv.c' --- util/tests/test_sysv.c 2009-07-09 11:50:19 +0000 +++ util/tests/test_sysv.c 2012-12-18 16:37:38 +0000 @@ -203,6 +203,8 @@ gettimeofday (&tv, NULL); record.ut_tv.tv_sec = tv.tv_sec; record.ut_tv.tv_usec = tv.tv_usec; + /* See comment in test_utmp */ + usleep(200); utmpxname (utmp_file); @@ -806,6 +808,8 @@ gettimeofday (&tv, NULL); record.ut_tv.tv_sec = tv.tv_sec; record.ut_tv.tv_usec = tv.tv_usec; + /* See comment in test_utmp */ + usleep(200); utmpxname (utmp_file); === modified file 'util/tests/test_utmp.c' --- util/tests/test_utmp.c 2009-07-14 11:04:34 +0000 +++ util/tests/test_utmp.c 2012-12-18 16:37:38 +0000 @@ -857,6 +857,13 @@ gettimeofday (&tv, NULL); record.ut_tv.tv_sec = tv.tv_sec; record.ut_tv.tv_usec = tv.tv_usec; + /* utmp/wtmp records do not have nanosecond resolution + * yet the tests expect time to lapse, but it might not + * on very, very fast machines. + * https://jenkins.qa.ubuntu.com/view/Raring/view/AutoPkgTest/job/raring-adt-upstart/ + * Is there a better way to fix the tests? + */ + usleep(200); utmpxname (utmp_file);
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
