summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS6
-rw-r--r--yarns/0100-fuse.yarn4
-rw-r--r--yarns/9000-implements.yarn13
3 files changed, 16 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 45fb90d6..be2d494a 100644
--- a/NEWS
+++ b/NEWS
@@ -63,6 +63,12 @@ Bug fixes:
* Tom Chiverton pointed out that the manual page was using "obnam
restore" instead of "obnam mount" in an example for "obnam mount".
+* The yarn test suite now runs FUSE tests (`obnam mount`) when
+ `fusermount` is available, rather than checking for membership in
+ the group `fuse`. The latter is a Debianism (fixed in Debian
+ `jessie`). This may result in the test suite not passing in Debian
+ `wheezy`.
+
Version 1.8, released 2014-05-13
--------------------------------
diff --git a/yarns/0100-fuse.yarn b/yarns/0100-fuse.yarn
index 7310846d..001e2f65 100644
--- a/yarns/0100-fuse.yarn
+++ b/yarns/0100-fuse.yarn
@@ -6,7 +6,7 @@ There's a lot of potential corner cases here, but for now, this
test suite concentrates on verifying that at least the basics work.
SCENARIO Browsing backups with FUSE plugin
- ASSUMING user is in group fuse
+ ASSUMING user can use FUSE
AND extended attributes are allowed for users
GIVEN directory L with interesting filesystem objects
AND a manifest of L in M
@@ -37,7 +37,7 @@ only read the first 64 kilobytes of a file. Verify that this is no
longer a problem.
SCENARIO restoring a big file with FUSE
- ASSUMING user is in group fuse
+ ASSUMING user can use FUSE
GIVEN 1M of data in file L/big.dat
AND a manifest of L in M
WHEN user U backs up directory L to repository R
diff --git a/yarns/9000-implements.yarn b/yarns/9000-implements.yarn
index de26a8b3..eb3946db 100644
--- a/yarns/9000-implements.yarn
+++ b/yarns/9000-implements.yarn
@@ -606,11 +606,14 @@ Some tests won't work correctly when `root` is running them.
IMPLEMENTS ASSUMING not running as root
test "$(id -u)" != 0
-Some tests, such as those for the FUSE plugin, require the user to be
-in a specific group.
-
- IMPLEMENTS ASSUMING user is in group (\S+)
- groups | tr ' ' '\n' | grep -Fx "$MATCH_1"
+For testing FUSE stuff, we need to check that the relevant stuff is
+avaialble. Previously, we did this by checking that the user running
+the test suite was in the group `fuse`, but that turns out to have
+been a Debianism (removed in the Debian `jessie` release). A better
+check is to check that the `fusermount` command is available.
+
+ IMPLEMENTS ASSUMING user can use FUSE
+ command -v fusermount
Check on whether user extended attributes work