Merge pull request #2778 from Martchus/misc-improvements

Polish scheduler fullstack test and worker log
os-autoinst · Feb 26, 2020 · 5ecec67 · 5ecec67
2 parents 0898d57 + 05a2624
commit 5ecec67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/lib/OpenQA/Worker/Job.pm b/lib/OpenQA/Worker/Job.pm
@@ -1159,8 +1159,7 @@ sub _read_json_file {
     local $/;
     my $fh;
     if (!open($fh, '<', $fn)) {
-        log_warning("Can't open $fn for result upload - likely isotovideo "
-              . "could not be started or failed early. Error message: $!");
+        log_debug("Unable to read $name: $!");
         return undef;
     }
     my $json = {};

diff --git a/t/05-scheduler-full.t b/t/05-scheduler-full.t
@@ -49,12 +49,11 @@ use Mojo::IOLoop::Server;
 use Mojo::File 'tempfile';
 use Time::HiRes 'sleep';
 use OpenQA::Test::Utils qw(
-  create_webapi wait_for_worker setup_share_dir
-  create_websocket_server create_scheduler
+  create_webapi wait_for_worker setup_share_dir create_websocket_server
   kill_service unstable_worker client_output unresponsive_worker
 );
 use Mojolicious;
-use File::Path qw(make_path remove_tree);
+use File::Path 'make_path';
 use DateTime;
 # This test has to be treated like fullstack.
 plan skip_all => "set SCHEDULER_FULLSTACK=1 (be careful)" unless $ENV{SCHEDULER_FULLSTACK};