From c0b530184e94d6c61ea15b3c75bd66f51fe958eb Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Fri, 10 Feb 2017 13:42:31 +0100 Subject: [PATCH] =?utf8?q?t/file/filesystem.t:=20keinen=20festen=20Namen?= =?utf8?q?=20f=C3=BCr=20tempor=C3=A4res=20Verzeichnis=20nutzen?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Weiterhin muss das Verzeichnis angelegt werden. Der Test darf sich nicht darauf verlassen, dass er einfach durchläuft. --- t/file/filesystem.t | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/t/file/filesystem.t b/t/file/filesystem.t index 314a2f23d..aa19ac714 100644 --- a/t/file/filesystem.t +++ b/t/file/filesystem.t @@ -2,6 +2,8 @@ use strict; use Test::More tests => 11; use lib 't'; + +use File::Temp; use Support::TestSetup; use Test::Exception; use SL::File; @@ -9,11 +11,16 @@ use SL::Dev::File; Support::TestSetup::login(); +my $temp_dir = File::Temp::tempdir("kivi-t-file-filesystem.XXXXXX", TMPDIR => 1, CLEANUP => 1); +my $storage_dir = "$temp_dir/storage"; + +mkdir($storage_dir) || die $!; + my $db = SL::DB::Object->new->db; $db->dbh->do("UPDATE defaults SET doc_files = 't'"); -$db->dbh->do("UPDATE defaults SET doc_files_rootpath = '/var/tmp/kivifs'"); +$db->dbh->do("UPDATE defaults SET doc_files_rootpath = ?", undef, $storage_dir); -my $scannerfile = '/var/tmp/f2'; +my $scannerfile = "${temp_dir}/f2"; clear_up(); reset_state(); @@ -77,9 +84,12 @@ clear_up(); done_testing; sub clear_up { - SL::Dev::File->delete_all(); - unlink($scannerfile); -}; + # Cleaning up may fail. + eval { + SL::Dev::File->delete_all(); + unlink($scannerfile); + }; +} sub reset_state { my %params = @_; -- 2.20.1