X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=t%2F01-jobs.t;h=a4e0c027ad25ca6b59314a3a1c166d2f1aefd62a;hp=16a88247a67010d64ba9c56e9dcf6cff9cc6c13d;hb=436deb1161131b25bf3b9384d0e81455179ceff4;hpb=7be5f05486dc972422c0243f7e0affe7c0dad523

diff --git a/t/01-jobs.t b/t/01-jobs.t
index 16a8824..a4e0c02 100644
--- a/t/01-jobs.t
+++ b/t/01-jobs.t
@@ -3,8 +3,6 @@ use v5.14;
 use strict;
 use warnings;
 
-use t::FakeData;
-BEGIN { Gruntmaster::Data->import }
 use Gruntmaster::Daemon;
 
 use Cwd qw/cwd/;
@@ -19,7 +17,7 @@ use YAML::Any qw/LoadFile/;
 
 ##################################################
 
-my $loglevel = $ENV{TEST_LOG_LEVEL} // 'OFF';
+my $loglevel = $ENV{TEST_LOG_LEVEL} // ($ENV{TEST_VERBOSE} ? 'TRACE' : 'OFF');
 my $log_conf = <<CONF;
 log4perl.category.Gruntmaster.Daemon = $loglevel, stderr
 
@@ -29,12 +27,13 @@ log4perl.appender.stderr.layout.ConversionPattern = [\%d] [\%F{1}:\%M{1}:\%L] [\
 CONF
 Log::Log4perl->init(\$log_conf);
 
-$ENV{PATH}.=':' . cwd;
+$ENV{PATH} = cwd . ':' . $ENV{PATH};
+umask 0022;
 
 sub check_job{
 	my $meta = shift;
 	if (defined $meta->{results}) {
-		delete $meta->{results}[$_]{time} for keys $meta->{results};
+		delete $meta->{results}[$_]{time} for keys @{$meta->{results}};
 	}
 	is $meta->{result}, $meta->{expected_result}, "Result is correct";
 	is $meta->{result_text}, $meta->{expected_result_text}, "Result text is correct";
@@ -45,7 +44,8 @@ my @problems = exists $ENV{TEST_PROBLEMS} ? map {"t/problems/$_"} split ' ', $EN
 plan tests => 3 * sum map { my @temp = <$_/tests/*>; scalar @temp } @problems;
 note "Problems to be tested: " . join ', ', @problems;
 
-my $tempdir = tempdir CLEANUP => 1;
+my $tempdir = tempdir "gruntmaster-daemon-testingXXXX", TMPDIR => 1, CLEANUP => 1;
+chmod 0777, $tempdir;
 
 my $job = 0;
 
@@ -56,7 +56,7 @@ for my $problem (@problems) {
 		$pbmeta->{okfile}[$_ - 1] = read_file "$problem/$_.ok" if $pbmeta->{runner} eq 'File';
 	}
 	if (exists $pbmeta->{files}) {
-		$_->{content} = read_file "$problem/$_->{name}" for values $pbmeta->{files}
+		$_->{content} = read_file "$problem/$_->{name}" for values %{$pbmeta->{files}}
 	}
 
   TODO: {