Executive: fixes following merge/reorg

diff --git a/Osstest/Executive.pm b/Osstest/Executive.pm
index 98967dfa6dacb7210b89942e0d0c157e0afc78d1..b04d2946ea57626eaf417ecee1778a5b21eba141 100644 (file)
--- a/Osstest/Executive.pm
+++ b/Osstest/Executive.pm
@@ -34,14 +34,24 @@ use File::Basename;
 use IO::Socket::INET;
 #use Data::Dumper;
 
+use Osstest;
+use Osstest::TestSupport;
+use Osstest::Executive;
+
 BEGIN {
     use Exporter ();
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw();
-    %EXPORT_TAGS = (
-       );
+    @EXPORT      = qw(get_harness_rev grabrepolock_reexec
+                      findtask @all_lock_tables
+                      tcpconnect_queuedaemon plan_search
+                      alloc_resources alloc_resources_rollback_begin_work
+                      resource_check_allocated resource_shared_mark_ready
+                      duration_estimator
+                      opendb_state
+                      );
+    %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
 }
@@ -77,25 +87,6 @@ our (@all_lock_tables) = qw(flights resources);
 #  Nontransactional reads are also permitted
 #  Transactional reads must take out locks as if they were modifying
 
-
-BEGIN {
-    use Exporter ();
-    our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
-    $VERSION     = 1.00;
-    @ISA         = qw(Exporter);
-    @EXPORT      = qw(dbfl_check get_harness_rev grabrepolock_reexec
-                      findtask @all_lock_tables
-                      tcpconnect_queuedaemon plan_search
-                      alloc_resources alloc_resources_rollback_begin_work
-                      resource_check_allocated resource_shared_mark_ready
-                      duration_estimator
-                      opendb_state
-                      );
-    %EXPORT_TAGS = ( );
-
-    @EXPORT_OK   = qw();
-}
-
 augmentconfigdefaults(
     ControlDaemonHost => 'woking.cam.xci-test.com',
     OwnerDaemonPort => 4031,

diff --git a/Osstest/HostDB/Executive.pm b/Osstest/HostDB/Executive.pm
index 56ce8945745f7875ff30cc65f1b05911f1f9e6b5..556251885fbb52fcd34950581d820d000d7bc898 100644 (file)
--- a/Osstest/HostDB/Executive.pm
+++ b/Osstest/HostDB/Executive.pm
@@ -44,9 +44,9 @@ sub get_properties ($$$) {
             WHERE restype='host' AND resname=?
 END
     $q->execute($name);
-    foreach my ($row = $q->fetchrow_hashref()) {
+    while (my $row = $q->fetchrow_hashref()) {
        my $name = $row->{name};
-       $hp{propname_massage($name)} = $row->{val};
+       $hp->{propname_massage($name)} = $row->{val};
     }
 }
 
@@ -79,7 +79,8 @@ sub default_methods ($$) {
 END
     $sth->execute($selname);
     my $row= $sth->fetchrow_hashref();
-    die "$ident $name $selname ?" unless $row;
+    my $name= $ho->{Name};
+    die "$ho->{Ident} $name $selname ?" unless $row;
     die if $sth->fetchrow_hashref();
     $sth->finish();
     my $get= sub {

diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index 5cc6e856be2406da55c9115c42c8de17de49c731..c57eabd97e91229e09543d69bebf36383816219b 100644 (file)
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -20,6 +20,8 @@ package Osstest::JobDB::Executive;
 use strict;
 use warnings;
 
+use Osstest;
+use Osstest::TestSupport;
 use Osstest::Executive;
 
 BEGIN {
@@ -27,13 +29,13 @@ BEGIN {
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw();
+    @EXPORT      = qw(dbfl_check);
     %EXPORT_TAGS = ( );
 
     @EXPORT_OK   = qw();
 }
 
-sub new { return bless {}, Osstest::JobDB::Standalone };
+sub new { return bless {}, $_[0] };
 
 sub begin_work ($$$) { #method
     my ($jd, $dbh,$tables) = @_;
@@ -84,8 +86,8 @@ END
     }
 }
 
-sub flight_create ($) { #method
-    my ($jd) = @_;
+sub flight_create ($$$) { #method
+    my ($jd,$intended,$branch) = @_;
     $dbh_tests->do(<<END, {}, $branch, $intended);
              INSERT INTO flights
                          (flight,  started, blessing,       branch, intended)
@@ -109,6 +111,7 @@ die "$flight.$job $count" unless $count==1;
                WHERE flight=$flight AND blessing='constructing'
 END
     logm("starting $flight") if $count>0;
+    my $now = time;
 
     $count= $dbh_tests->do(<<END);
            UPDATE flights SET started=$now
@@ -119,11 +122,12 @@ END
 
 sub host_check_allocated ($$) { #method
     my ($jd, $ho) = @_;
-    $ho->{Shared}= resource_check_allocated('host', $name);
+    $ho->{Shared}= resource_check_allocated('host', $ho->{Name});
     $ho->{SharedReady}=
         $ho->{Shared} &&
         $ho->{Shared}{State} eq 'ready' &&
-        !! grep { $_ eq "share-".$ho->{Shared}{Type} } get_hostflags($ident);
+        !! (grep { $_ eq "share-".$ho->{Shared}{Type} }
+           get_hostflags($ho->{Ident}));
     $ho->{SharedOthers}=
         $ho->{Shared} ? $ho->{Shared}{Others} : 0;
     
@@ -141,8 +145,8 @@ sub gen_ether_offset ($$) { #method
 }
 
 sub jobdb_resource_shared_mark_ready { #method
-    my $mo = shift @_;
-    resource_shared_mark_ready(@_);
+    my ($mo, $restype, $resname, $sharetype) = @_;
+    resource_shared_mark_ready($restype, $resname, $sharetype);
 }
 
 sub jobdb_check_other_job { #method