Merge branch 'master' into scaleway

diff --combined lib/Gruntmaster/Daemon.pm
index ef3aea61a758222da80b195914079246e8e02920,7a9dea668726a655c55ae36951dae459fa6bac04..8a270d68260fc0785f6a59d16b9b1c162c9b7254
--- 1/lib/Gruntmaster/Daemon.pm
--- 2/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@@ -7,7 -7,7 +7,7 @@@ use warnings
  our $VERSION = '5999.000_005';
  
  use Gruntmaster::Daemon::Constants qw/ERR/;
 -use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
 +use Gruntmaster::Daemon::Format qw/prepare_files copy_from_vm stopvms/;
  
  use File::Slurp qw/read_file/;
  use File::Temp qw/tempdir/;
@@@ -34,6 -34,7 +34,7 @@@ use constant FORMAT_EXTENSION => 
        PERL => 'pl',
        PHP => 'php',
        PYTHON => 'py',
+       PYTHON3 => 'py',
        RUBY => 'rb',
        RUST => 'rs',
        SBCL => 'l',
@@@ -85,7 -86,6 +86,7 @@@ sub process
                        unlink 'time-start-prog', 'time-stop-prog';
                        if (ref $result) {
                                my $result_text = $result->[1];
 +                              copy_from_vm 'result';
                                $result_text .= ': ' . read_file 'result' if -s 'result';
                                get_logger->trace("Test $test result is " . $result_text);
                                push @full_results, {id => $test, result => $result->[0], result_text => $result_text, time => $time}