135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add tests

Browse Source
This commit is contained in:
Oliver Gorwits
2017-11-12 20:38:35 +00:00
parent 2de36c69ba
commit 840b6b4069
6 changed files with 113 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/App/Netdisco/Backend/Job.pm
View File

@@ -72,8 +72,8 @@ sub finalise_status {
my $max_level = Status->error()->level;
foreach my $status (reverse @{ $job->_statuslist }) {
next unless $status->phase
and $status->phase =~ m/^(?:check|early|main)$/;
next if $status->phase
and $status->phase !~ m/^(?:check|early|main)$/;
next if $status->phase eq 'check'
and $status->level eq Status->done()->level;
@@ -154,7 +154,7 @@ status cache. Phase slot of the Status will be set to the current phase.
sub add_status {
my ($job, $status) = @_;
return unless ref $status eq 'App::Netdisco::Worker::Status';
$status->phase( $job->_current_phase );
$status->phase( $job->_current_phase || '' );
push @{ $job->_statuslist }, $status;
debug $status->log if $status->log
and (($status->phase eq 'check')

6
lib/App/Netdisco/Worker/Runner.pm
View File

@@ -28,6 +28,9 @@ sub run {
$job->device( get_device($job->device) );
Module::Load::load 'App::Netdisco::Worker' => $job->action;
# finalise job status when we exit
my $statusguard = guard { $job->finalise_status };
my @newuserconf = ();
my @userconf = @{ setting('device_auth') || [] };
@@ -52,9 +55,6 @@ sub run {
my $configguard = guard { set(device_auth => \@userconf) };
set(device_auth => \@newuserconf);
# finalise job status when we exit
my $statusguard = guard { $job->finalise_status };
# run check phase and if there are workers then one MUST be successful
$self->run_workers('nd2_core_check');
return if not $job->check_passed;