ChangeLogTag:Tue Jan 25 19:01:33 2000 Carlos O'Ryan <coryan@cs.wustl.edu>

5 files changed, 29 insertions, 4 deletions

diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 29e4b11d232..66a18de1b3a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -269,6 +269,7 @@ Task::svc ()
   ACE_TRY_NEW_ENV
     {
       this->run (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 49fbbbc719c..23b2604ebce 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -98,7 +98,7 @@ run_test (PortableServer::POA_ptr poa,
 
   Task task (event_channel.in (), use_callbacks);
 
-  if (task.activate (THR_BOUND|THR_NEW_LWP, 10) != 0)
+  if (task.activate (THR_BOUND|THR_NEW_LWP, 1) != 0)
     {
       ACE_ERROR ((LM_ERROR, "Cannot activate the tasks\n"));
     }
diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index f6ad83a0035..0cad880b39a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -172,6 +172,9 @@ main (int argc, char* argv[])
 
       negation_consumer.dump_results (200, 5);
       regular_consumer.dump_results (100, 5);
+
+      orb->destroy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index 413e0cd260f..036ea4bf3b5 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -120,10 +120,31 @@ EC_Master::run (int argc, char* argv[])
           }
       }
 
+      {
+        for (int i = 0; i != this->n_channels_; ++i)
+          {
+            this->channels_[i]->disconnect_clients (ACE_TRY_ENV);
+            ACE_TRY_CHECK;
+            this->channels_[i]->shutdown_clients (ACE_TRY_ENV);
+            ACE_TRY_CHECK;
+            this->channels_[i]->destroy_ec (ACE_TRY_ENV);
+            ACE_TRY_CHECK;
+            this->channels_[i]->deactivate_ec (ACE_TRY_ENV);
+            ACE_TRY_CHECK;
+            this->channels_[i]->cleanup_tasks ();
+            this->channels_[i]->cleanup_suppliers ();
+            this->channels_[i]->cleanup_consumers ();
+            this->channels_[i]->cleanup_ec ();
+          }
+      }
+
       this->root_poa_->destroy (1,
                                 1,
                                 ACE_TRY_ENV);
       ACE_TRY_CHECK;
+
+      this->orb_->destroy (ACE_TRY_ENV);
+      ACE_TRY_CHECK;
    }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/tests/Event/Basic/run_test.pl b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
index 11b67b021c6..1f05451f347 100755
--- a/TAO/orbsvcs/tests/Event/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Event/Basic/run_test.pl
@@ -92,8 +92,8 @@ if ($T->TimedWait (60) == -1) {
 
 print STDERR "\n\nMT Disconnects test\n";
 $T = Process::Create ($prefix . "MT_Disconnect".$EXE_EXT,
-		     " -ORBSvcConf mt.svc.conf");
-if ($T->TimedWait (120) == -1) {
+                     " -ORBSvcConf mt.svc.conf");
+if ($T->TimedWait (240) == -1) {
   print STDERR "ERROR: Test timedout\n";
   $status = 1;
   $T->Kill (); $T->TimedWait (1);
@@ -101,7 +101,7 @@ if ($T->TimedWait (120) == -1) {
 
 print STDERR "\n\nAtomic Reconnection test\n";
 $T = Process::Create ($prefix . "Atomic_Reconnect".$EXE_EXT,
-		     " -ORBSvcConf mt.svc.conf");
+                     " -ORBSvcConf mt.svc.conf");
 if ($T->TimedWait (120) == -1) {
   print STDERR "ERROR: Test timedout\n";
   $status = 1;