[Python-apps-commits] r11084 - in packages/s3ql/trunk/debian (2 files)

[nikratio-guest at users.alioth.debian.org]

    Date: Sunday, July 20, 2014 @ 19:14:48
  Author: nikratio-guest
Revision: 11084

Made system clock resolution heuristic in unittests even more
conservative, there are still occasional build failures on i386.

Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/patches/clock-granularity.diff

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2014-07-20 19:12:47 UTC (rev 11083)
+++ packages/s3ql/trunk/debian/changelog	2014-07-20 19:14:48 UTC (rev 11084)
@@ -1,3 +1,10 @@
+s3ql (2.9+dfsg-3) UNRELEASED; urgency=medium
+
+  * Made system clock resolution heuristic in unittests even more
+    conservative, there are still occasional build failures on i386.
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Sun, 20 Jul 2014 12:13:22 -0700
+
 s3ql (2.9+dfsg-2) unstable; urgency=medium
 
   * Cherry-picked kFreeBSD compatibility patch from upstream

Modified: packages/s3ql/trunk/debian/patches/clock-granularity.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/clock-granularity.diff	2014-07-20 19:12:47 UTC (rev 11083)
+++ packages/s3ql/trunk/debian/patches/clock-granularity.diff	2014-07-20 19:14:48 UTC (rev 11084)
@@ -1,7 +1,7 @@
 Description: Estimate system clock granularity more conservatively
 Origin: debian
 Forwarded: no
-Last-Update: <2013-10-20>
+Last-Update: <2014-07-20>
 Author: Nikolaus Rath <Nikolaus at rath.org>
 
 Some unit tests check that file access time stamps are updated
@@ -18,7 +18,7 @@
  while stamp1 == stamp2:
      stamp2 = time.time()
 -CLOCK_GRANULARITY = 2 * (stamp2 - stamp1)
-+CLOCK_GRANULARITY = max(0.1, 10 * (stamp2 - stamp1))
++CLOCK_GRANULARITY = max(1, 10 * (stamp2 - stamp1))
  del stamp1
  del stamp2