[Python-apps-commits] r10122 - in packages/s3ql/trunk/debian (4 files)

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

    Date: Sunday, October 20, 2013 @ 21:53:16
  Author: nikratio-guest
Revision: 10122

Estimate clock resolution more conservatively when running unit
tests.

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

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2013-10-20 21:24:04 UTC (rev 10121)
+++ packages/s3ql/trunk/debian/changelog	2013-10-20 21:53:16 UTC (rev 10122)
@@ -1,3 +1,10 @@
+s3ql (2.5-3) UNRELEASED; urgency=low
+
+  * Estimate clock resolution more conservatively when running unit
+    tests.
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Sun, 20 Oct 2013 14:51:45 -0700
+
 s3ql (2.5-2) unstable; urgency=low
 
   * Do not try to write logfiles into $HOME when running self tests.

Added: packages/s3ql/trunk/debian/patches/clock-granularity.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/clock-granularity.diff	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/clock-granularity.diff	2013-10-20 21:53:16 UTC (rev 10122)
@@ -0,0 +1,24 @@
+Description: Estimate system clock granularity more conservatively
+Origin: debian
+Forwarded: no
+Last-Update: <2013-10-20>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+Some unit tests check that file access time stamps are updated
+correctly. For such a test to succeed, it's necessarily that the time
+between two subsequent test-accesses can actually be resolved. The
+heuristic to determine this granularity doesn't seem to work well on
+e.g. the i386 buildd, so we make it much more conservative. This
+means the test suite runs longer, but otherwise has no ill effects.
+
+--- a/tests/t3_fs_api.py
++++ b/tests/t3_fs_api.py
+@@ -43,7 +43,7 @@
+ stamp2 = stamp1
+ while stamp1 == stamp2:
+     stamp2 = time.time()
+-CLOCK_GRANULARITY = 2 * (stamp2 - stamp1)
++CLOCK_GRANULARITY = max(0.1, 10 * (stamp2 - stamp1))
+ del stamp1
+ del stamp2
+ 

Modified: packages/s3ql/trunk/debian/patches/proc_mount.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/proc_mount.diff	2013-10-20 21:24:04 UTC (rev 10121)
+++ packages/s3ql/trunk/debian/patches/proc_mount.diff	2013-10-20 21:53:16 UTC (rev 10122)
@@ -4,9 +4,9 @@
 Last-Update: <2012-01-04>
 Author: Nikolaus Rath <Nikolaus at rath.org>
 
---- s3ql-1.9.orig/tests/t4_adm.py
-+++ s3ql-1.9/tests/t4_adm.py
-@@ -48,6 +48,7 @@ class AdmTests(TestCase):
+--- a/tests/t4_adm.py
++++ b/tests/t4_adm.py
+@@ -47,6 +47,7 @@
  
          self.assertEqual(proc.wait(), 0)
  

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2013-10-20 21:24:04 UTC (rev 10121)
+++ packages/s3ql/trunk/debian/patches/series	2013-10-20 21:53:16 UTC (rev 10122)
@@ -1,2 +1,3 @@
 proc_mount.diff
+clock-granularity.diff
 sphinx-1.1.1-compat.diff