some reengineering to support proper testing

lib/App/Netdisco/Backend/Job.pm

@@ -78,7 +78,7 @@ sub finalise_status {
     next if $status->phase eq 'check'
       and $status->level eq Status->done()->level;
 
-    if ($status->level > $max_level) {
+    if ($status->level >= $max_level) {
       $job->status( $status->status );
       $job->log( $status->log );
       $max_level = $status->level;

lib/App/Netdisco/Worker.pm

@@ -27,19 +27,17 @@ sub import {
   }
 
   # now vars->{workers} is populated, we set the dispatch order
-  my $store = Dancer::Factory::Hook->instance();
+  my $workers = vars->{'workers'}->{$action} || {};
   # use DDP; p vars->{'workers'};
 
   foreach my $phase (qw/check early main user/) {
-    $store->install_hooks("nd2_core_${phase}");
-
-    foreach my $namespace (sort keys %{ vars->{'workers'}->{$phase} }) {
+    foreach my $namespace (sort keys %{ $workers->{$phase} }) {
       foreach my $priority (sort {$b <=> $a}
-                            keys %{ vars->{'workers'}->{$phase}->{$namespace} }) {
+                            keys %{ $workers->{$phase}->{$namespace} }) {
 
         # D::Factory::Hook::register_hook() does not work?!
         hook "nd2_core_${phase}" => $_
-          for @{ vars->{'workers'}->{$phase}->{$namespace}->{$priority} };
+          for @{ $workers->{$phase}->{$namespace}->{$priority} };
       }
     }
   }

lib/App/Netdisco/Worker/Plugin.pm

@@ -5,9 +5,11 @@ use Dancer::Plugin;
 
 use App::Netdisco::Util::Permission qw/check_acl_no check_acl_only/;
 use aliased 'App::Netdisco::Worker::Status';
-
 use Scope::Guard 'guard';
 
+Dancer::Factory::Hook->instance()->install_hooks("nd2_core_${_}")
+  for qw/check early main user/;
+
 register 'register_worker' => sub {
   my ($self, $first, $second) = plugin_args(@_);
 
@@ -76,7 +78,7 @@ register 'register_worker' => sub {
   };
 
   # store the built worker as Worker.pm will build the dispatch order later on
-  push @{ vars->{'workers'}
+  push @{ vars->{'workers'}->{$workerconf->{action}}
               ->{$workerconf->{phase}}
               ->{$workerconf->{namespace}}
               ->{$workerconf->{priority}} }, $worker;

lib/App/Netdisco/Worker/Plugin/Test.pm

@@ -1,27 +0,0 @@
-package App::Netdisco::Worker::Plugin::Test;
-
-use Dancer ':syntax';
-use App::Netdisco::Worker::Plugin;
-use aliased 'App::Netdisco::Worker::Status';
-
-register_worker({ phase => 'check', driver => 'snmp' }, sub {
-  my ($job, $workerconf) = @_;
-  return Status->done('Test (check) ran successfully.');
-});
-
-register_worker({ phase => 'check', priority => 100 }, sub {
-  my ($job, $workerconf) = @_;
-  return Status->done('Test (check 100) ran successfully.');
-});
-
-register_worker({ phase => 'check', priority => 120 }, sub {
-  my ($job, $workerconf) = @_;
-  return Status->done('Test (check 120) ran successfully.');
-});
-
-register_worker({ phase => 'check', driver => 'eapi' }, sub {
-  my ($job, $workerconf) = @_;
-  return Status->done('Test (check eapi) ran successfully.');
-});
-
-true;

lib/App/Netdisco/Worker/Plugin/Test/Core.pm

@@ -1,37 +0,0 @@
-package App::Netdisco::Worker::Plugin::Test::Core;
-
-use Dancer ':syntax';
-use App::Netdisco::Worker::Plugin;
-use aliased 'App::Netdisco::Worker::Status';
-
-register_worker({ phase => 'early' }, sub {
-  my ($job, $workerconf) = @_;
-  return Status->error('Test (early) ran successfully.');
-});
-
-register_worker({ phase => 'early' }, sub {
-  my ($job, $workerconf) = @_;
-  return Status->done('Test (early) ran successfully.');
-});
-
-register_worker({ phase => 'main' }, sub {
-  my ($job, $workerconf) = @_;
-  return Status->done('Test (main) ran successfully (1).');
-});
-
-register_worker({ phase => 'main' }, sub {
-  my ($job, $workerconf) = @_;
-  return Status->done('Test (main) ran successfully (2).');
-});
-
-register_worker(sub {
-  my ($job, $workerconf) = @_;
-  return Status->noop('Test (user) ran successfully.');
-});
-
-register_worker(sub {
-  my ($job, $workerconf) = @_;
-  return Status->error('Test (user) ran successfully.');
-});
-
-true;

xt/30-backend-workers.t

@@ -0,0 +1,67 @@
+#!/usr/bin/env perl
+
+use strict; use warnings FATAL => 'all';
+use Test::More 0.88;
+
+use lib 'xt/lib';
+
+use App::Netdisco;
+use App::Netdisco::Backend::Job;
+
+use Try::Tiny;
+use Dancer qw/:moose :script !pass/;
+
+# configure logging to force console output
+my $CONFIG = config();
+$CONFIG->{logger} = 'console';
+$CONFIG->{log} = 'error';
+Dancer::Logger->init('console', $CONFIG);
+
+{
+  package MyWorker;
+  use Moo;
+  with 'App::Netdisco::Worker::Runner';
+}
+
+# TESTS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+my $j1 = do_job('TestOne');
+is($j1->status, 'done', 'status is done');
+is($j1->log, 'OK: SNMP driver is successful.',
+  'workers are run in decreasing priority until done');
+
+my $j2 = do_job('TestTwo');
+is($j2->status, 'done', 'status is done');
+is($j2->log, 'OK: CLI driver is successful.',
+  'lower priority driver not run if higher is successful');
+
+# TESTS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+done_testing;
+
+sub do_job {
+  my $pkg = shift;
+
+  # include local plugins
+  config->{'extra_worker_plugins'} = ["X::${pkg}"];
+
+  # clear out any previous installed hooks
+  Dancer::Factory::Hook->init( Dancer::Factory::Hook->instance() );
+
+  my $job = App::Netdisco::Backend::Job->new({
+    job => 0,
+    action => lc($pkg),
+  });
+
+  try {
+    #info sprintf 'test: started at %s', scalar localtime;
+    MyWorker->new()->run($job);
+    #info sprintf 'test: %s: %s', $job->status, $job->log;
+  }
+  catch {
+    $job->status('error');
+    $job->log("error running job: $_");
+  };
+
+  return $job;
+}

xt/lib/App/NetdiscoX/Worker/Plugin/TestOne.pm

@@ -0,0 +1,17 @@
+package App::NetdiscoX::Worker::Plugin::TestOne;
+
+use Dancer ':syntax';
+use App::Netdisco::Worker::Plugin;
+use aliased 'App::Netdisco::Worker::Status';
+
+# info 'test: workers are run in decreasing priority until done';
+
+register_worker({ phase => 'main', driver => 'cli' }, sub {
+  return Status->noop('NOT OK: CLI driver is not the winner here.');
+});
+
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
+  return Status->done('OK: SNMP driver is successful.');
+});
+
+true;

xt/lib/App/NetdiscoX/Worker/Plugin/TestTwo.pm

@@ -0,0 +1,17 @@
+package App::NetdiscoX::Worker::Plugin::TestTwo;
+
+use Dancer ':syntax';
+use App::Netdisco::Worker::Plugin;
+use aliased 'App::Netdisco::Worker::Status';
+
+# info 'test: lower priority driver not run if higher is successful';
+
+register_worker({ phase => 'main', driver => 'snmp' }, sub {
+  return Status->done('NOT OK: SNMP driver should NOT be run.');
+});
+
+register_worker({ phase => 'main', driver => 'cli' }, sub {
+  return Status->done('OK: CLI driver is successful.');
+});
+
+true;