[Python-apps-commits] r11056 - in packages/s3ql/trunk/debian (3 files)

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

    Date: Saturday, July 12, 2014 @ 04:59:36
  Author: nikratio-guest
Revision: 11056

Added patches/check_dev_fuse_perms.diff to avoid running FUSE
tests on continous integration servers where /dev/fuse is
not accessible.

Added:
  packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff
Modified:
  packages/s3ql/trunk/debian/changelog
  packages/s3ql/trunk/debian/patches/series

Modified: packages/s3ql/trunk/debian/changelog
===================================================================
--- packages/s3ql/trunk/debian/changelog	2014-07-11 19:30:44 UTC (rev 11055)
+++ packages/s3ql/trunk/debian/changelog	2014-07-12 04:59:36 UTC (rev 11056)
@@ -6,6 +6,9 @@
     that Sphinx 1.2 is in unstable).
   * Added patches/sphinx_build_locale_fix.diff (cherry-picked from upstream)
     to make documentation build work independent of system locale.
+  * Added patches/check_dev_fuse_perms.diff to avoid running FUSE
+    tests on continous integration servers where /dev/fuse is
+    not accessible.
 
  -- Nikolaus Rath <Nikolaus at rath.org>  Sat, 28 Jun 2014 12:30:45 -0700
 

Added: packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff
===================================================================
--- packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff	                        (rev 0)
+++ packages/s3ql/trunk/debian/patches/check_dev_fuse_perms.diff	2014-07-12 04:59:36 UTC (rev 11056)
@@ -0,0 +1,27 @@
+Description: Skip tests requiring FUSE if we can't open /dev/fuse
+Origin: debian
+Forwarded: no
+Last-Update: <2014-07-11>
+Author: Nikolaus Rath <Nikolaus at rath.org>
+
+The machines running the debci continuous integration tests seem
+to have an unusual configuration where /bin/fusermount is setuid
+root, but /dev/fuse has 0600 permissions. If this is the case,
+we need to skip tests that require FUSE.
+
+--- a/tests/common.py
++++ b/tests/common.py
+@@ -173,6 +173,13 @@
+     except subprocess.CalledProcessError:
+         raise unittest.SkipTest('Unable to execute fusermount') from None
+ 
++    try:
++        fd = os.open('/dev/fuse', os.O_RDWR)
++    except PermissionError:
++        raise unittest.SkipTest('No permission to access /dev/fuse') from None
++    else:
++        os.close(fd)
++
+ def skip_without_rsync():
+     try:
+         with open('/dev/null', 'wb') as null:

Modified: packages/s3ql/trunk/debian/patches/series
===================================================================
--- packages/s3ql/trunk/debian/patches/series	2014-07-11 19:30:44 UTC (rev 11055)
+++ packages/s3ql/trunk/debian/patches/series	2014-07-12 04:59:36 UTC (rev 11056)
@@ -1,3 +1,4 @@
 proc_mount.diff
 clock-granularity.diff
 sphinx_build_locale_fix.diff
+check_dev_fuse_perms.diff