Changeset 237

Timestamp:

04/24/06 11:30:22 (18 years ago)

Author:

nanardon

Message:

• fix #5 (invalid plugin code does not return an error)
• replace exit by return, propagate the return value
• add test case

Location:

trunk/soft/ObsData

Files:

• ObsData.pm (modified) (3 diffs)
• t/O-01.t (modified) (2 diffs)
• testdata/obsdata-conf-wrongplugin (added)
• testdata/wrong.pl (added)

trunk/soft/ObsData/ObsData.pm

@@ -101 +101 @@
     }
     
-    $self->load_plugins();
+    $self->load_plugins() or return 0;
     
     return 1;
@@ -134 +134 @@
                     $datatype,
                 );
-                exit(1);
+                return 0;
             }
             my $sub = do $plugfilename;
+            if ($@) {
+                $self->logging(4,
+                    "Cannot load plugin %s for %s: %s, exiting !",
+                    $plugin,
+                    $datatype,
+                    $@,
+                );
+                return 0;
+            }
             if ($sub && ref $sub eq 'CODE') {
                 $self->{plugin}{$datatype}{$plugin} = {
@@ -158 +167 @@
         }
     }
+    return 1;
 }
 

trunk/soft/ObsData/t/O-01.t

@@ -4 +4 @@
 use warnings;
 
-use Test::More tests => 4;
+use Test::More tests => 6;
 
 use_ok('ObsData');
@@ -12 +12 @@
 ok(!ObsData->new('testdata/wrongfile'), "Return an error on bad file");
 ok(!ObsData->new(undef), "Return an error w/o a config file");
+
+ok(my $o = ObsData->new('testdata/obsdata-conf-wrongplugin'), "Can get an Obsdata object");
+ok(!$o->load(), "load() return an error if an invalid plugiin is found");