extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-12-23 15:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use portable_unmount in reverse tests

Browse Source 
Fixes unmount failure on OSX
This commit is contained in:
Jakob Unterwurzacher 2014-12-30 23:05:23 +01:00
parent 6239a3c58f
commit b05872d85d
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tests/common.pl
View File

@ -1,3 +1,16 @@
# Portable FUSE unmount
# works on Linux AND OSX
sub portable_unmount {
my $crypt = shift;
my $fusermount = qx(which fusermount);
chomp($fusermount);
if(-f $fusermount) {
qx($fusermount -u "$crypt");
} else {
qx(umount "$crypt");
}
}
# Helper function # Helper function
# Get the MD5 sum of the file open at the filehandle # Get the MD5 sum of the file open at the filehandle
use Digest::MD5 qw(md5_hex); use Digest::MD5 qw(md5_hex);

10
tests/normal.t.pl
View File

@ -316,15 +316,7 @@ sub mount
# Unmount and delete mountpoint # Unmount and delete mountpoint
sub cleanup sub cleanup
{ {
my $fusermount = qx(which fusermount); portable_unmount($crypt);
chomp($fusermount);
if(-f $fusermount)
{
qx($fusermount -u "$crypt");
} else
{
qx(umount "$crypt");
}
rmdir $crypt; rmdir $crypt;
ok( ! -d $crypt, "unmount ok, mount point removed"); ok( ! -d $crypt, "unmount ok, mount point removed");

4
tests/reverse.t.pl
View File

@ -32,8 +32,8 @@ sub newWorkingDir
# Unmount and delete mountpoint # Unmount and delete mountpoint
sub cleanup sub cleanup
{ {
system("fusermount -u $decrypted"); portable_unmount($decrypted);
system("fusermount -u $ciphertext"); portable_unmount($ciphertext);
our $workingDir; our $workingDir;
rmtree($workingDir); rmtree($workingDir);
ok( ! -d $workingDir, "working dir removed"); ok( ! -d $workingDir, "working dir removed");