Merge lp:~xnox/upstart/utmp-usleep into lp:upstart

[Dimitri John Ledkov]

[James Hunt (jamesodhunt)]

> Is there a better way to fix the tests?
Sleeps are generally dubious, but aside from spinning calling gettimeofday() until the time changes, this looks like the best solution.

Merged.

review: Approve

=== 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:40:57 +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:40:57 +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);