Executive: fixes following merge/reorg

diff --git a/Osstest.pm b/Osstest.pm
index 4395d866b13039b6953f17456a27fbd471e2a745..386b7ea0bbd8178e9df447bd27cfd6d9df3ad1a0 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -32,7 +32,8 @@ BEGIN {
                       csreadconfig
                       getmethod
                       postfork
-                      $dbh_tests db_retry db_begin_work                      
+                      $dbh_tests db_retry db_retry_retry db_retry_abort
+                      db_begin_work
                       ensuredir get_filecontents_core_quiet system_checked
                       nonempty
                       );

diff --git a/ts-hosts-allocate-Executive b/ts-hosts-allocate-Executive
index 0d434c96b734cbbd294999ff5445e095b21fda4e..c24c0a2342806b613f5fd64466646c9813b5d9cf 100755 (executable)
--- a/ts-hosts-allocate-Executive
+++ b/ts-hosts-allocate-Executive
@@ -23,9 +23,9 @@ use POSIX;
 use JSON;
 use IO::Handle;
 use Osstest::TestSupport;
+use Osstest::Executive;
 
 tsreadconfig();
-opendb_state();
 
 open DEBUG, ">/dev/null" or die $!;