[Python-apps-commits] r11578 - in packages/s3ql/trunk/debian (6 files)

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

    Date: Tuesday, November 11, 2014 @ 03:40:34
  Author: nikratio-guest
Revision: 11578

* Added patches/debug_test_thread_hang.diff to debug occasional test
  failures on buildds.
* Added patches/fix_test_check_objects_temp.diff (cherry-picked
  upstream) to fix occasional test failures during build.

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

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2014-11-11 02:57:36 UTC (rev 11577)
+++ packages/s3ql/trunk/debian/changelog	2014-11-11 03:40:34 UTC (rev 11578)
@@ -1,3 +1,13 @@
+s3ql (2.12+dfsg-2) UNRELEASED; urgency=medium
+
+  * Added patches/debug_test_thread_hang.diff to debug occasional test
+    failures on buildds.
+
+  * Added patches/fix_test_check_objects_temp.diff (cherry-picked
+    upstream) to fix occasional test failures during build.
+
+ -- Nikolaus Rath <Nikolaus at rath.org>  Mon, 10 Nov 2014 18:58:07 -0800
+
 s3ql (2.12+dfsg-1) experimental; urgency=medium
 
   * New upstream release.

Modified: packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff	2014-11-11 02:57:36 UTC (rev 11577)
+++ packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff	2014-11-11 03:40:34 UTC (rev 11578)
@@ -11,7 +11,7 @@
 
 --- a/tests/common.py
 +++ b/tests/common.py
-@@ -196,6 +196,13 @@
+@@ -130,6 +130,13 @@
      else:
          os.close(fd)
  

Modified: packages/s3ql/trunk/debian/patches/clock-granularity.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/clock-granularity.diff	2014-11-11 02:57:36 UTC (rev 11577)
+++ packages/s3ql/trunk/debian/patches/clock-granularity.diff	2014-11-11 03:40:34 UTC (rev 11578)
@@ -13,7 +13,7 @@
 
 --- a/tests/common.py
 +++ b/tests/common.py
-@@ -29,7 +29,7 @@
+@@ -26,7 +26,7 @@
      stamp2 = stamp1
      while stamp1 == stamp2:
          stamp2 = time.time()

Added: packages/s3ql/trunk/debian/patches/debug_test_thread_hang.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/debug_test_thread_hang.diff	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/debug_test_thread_hang.diff	2014-11-11 03:40:34 UTC (rev 11578)
@@ -0,0 +1,28 @@
+Description: Print debugging information if test_thread_hang hangs
+Origin: upstream
+Forwarded: not-needed
+Last-Update: <2014-11-10>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+This patch should help upstream debug a test hang on the buildds
+when it occurs (it seems to be sporadic).
+
+--- a/tests/t2_block_cache.py
++++ b/tests/t2_block_cache.py
+@@ -34,6 +34,7 @@
+ import unittest
+ import queue
+ import pytest
++import faulthandler
+ 
+ # A dummy removal queue to monkeypatch around the need for removal and upload
+ # threads
+@@ -115,6 +116,8 @@
+         os.unlink(self.dbfile.name)
+ 
+     def test_thread_hang(self):
++        faulthandler.dump_traceback_later(300)
++
+         # Make sure that we don't deadlock if uploads threads or removal
+         # threads have died and we try to expire or terminate
+ 

Added: packages/s3ql/trunk/debian/patches/fix_test_check_objects_temp.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/fix_test_check_objects_temp.diff	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/fix_test_check_objects_temp.diff	2014-11-11 03:40:34 UTC (rev 11578)
@@ -0,0 +1,19 @@
+Description: Fix test_check_objects_temp
+Origin: upstream, commit 746f6ce67056.
+Forwarded: not-needed
+Last-Update: <2014-11-10>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+check_objects_temp(): take into account that thread id may be negative.
+
+--- a/src/s3ql/fsck.py
++++ b/src/s3ql/fsck.py
+@@ -873,7 +873,7 @@
+ 
+         for (path, dirnames, filenames) in os.walk(plain_backend.prefix, topdown=True):
+             for name in filenames:
+-                if not re.search(r'^[^#]+#[0-9]+-[0-9]+\.tmp$', name):
++                if not re.search(r'^[^#]+#[0-9]+--?[0-9]+\.tmp$', name):
+                     continue
+ 
+                 self.found_errors = True

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2014-11-11 02:57:36 UTC (rev 11577)
+++ packages/s3ql/trunk/debian/patches/series	2014-11-11 03:40:34 UTC (rev 11578)
@@ -1,3 +1,5 @@
+debug_test_thread_hang.diff
+fix_test_check_objects_temp.diff
 proc_mount.diff
 clock-granularity.diff
 check_dev_fuse_perms.diff