Wed Apr 3 16:40:46 UTC 2013 Byron Harris <harrisb@ociweb.com>

4 files changed, 47 insertions, 5 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 66dff3646c6..534479978d6 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Wed Apr  3 16:40:46 UTC 2013  Byron Harris  <harrisb@ociweb.com>
+
+        * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp:
+
+          Add additional error checking/output in
+          do_persistence_objectgroup_test() to help diagnose test
+          failure seen on a few platforms.
+
+        * orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp:
+
+          Write a status file to indicate server is running.
+
+        * orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl:
+
+          Use server's status file to check that server is running
+          since group member IOR files are written after server's IOR
+          is written.
+
 Sat Mar 30 18:12:28 UTC 2013  Martin Corino  <mcorino@remedy.nl>
 
         * tests/File_IO/File_i.cpp:
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
index 4c2c7309bf7..cdae2a9eaf0 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp
@@ -1567,6 +1567,15 @@ do_persistence_objectgroup_test (
             std::string member_ior;
             in >> member_ior;
 
+            if (!in.good ())
+              {
+                ACE_ERROR_RETURN  ((LM_ERROR,
+                                    ACE_TEXT ("ERROR: Unable to read member data ")
+                                    ACE_TEXT ("from file %C\n"),
+                                    member_data_file.c_str ()),
+                                   RC_ERROR);
+              }
+
             CORBA::Object_var member =
               theOrb->string_to_object(member_ior.c_str ());
             PortableGroup::Location location_name (1);
@@ -1603,12 +1612,13 @@ do_persistence_objectgroup_test (
                             ACE_TEXT ("ERROR: No group names found")));
               }
           }
-        catch (const CORBA::Exception&)
+        catch (const CORBA::Exception& ex)
           {
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("ERROR: Unable to remove member for group %C\n"),
                                basic_group_name),
                               RC_ERROR);
+            ex._tao_print_exception ("CORBA::Exception caught:");
           }
       }
 
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
index abb657719a0..f69cccd341d 100755
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/run_persistence_test.pl
@@ -257,8 +257,11 @@ my $group_dir   = "GroupService";
 my $nm_iorfile  = "nm.ior";
 my $ns_iorfile  = "ns.ior";
 my $sv_iorfile  = "obj.ior";
+my $sv_statusfile = "server.status";
+
 my $ns_ref      = "--ns file://$ns_iorfile";
 my $sv2_iorfile = $server2->LocalFile ($sv_iorfile);
+my $sv2_statusfile = $server2->LocalFile ($sv_statusfile);
 
 
 
@@ -275,6 +278,7 @@ END
     $client->DeleteFile ($stderr_file);
     $client->DeleteFile ($client_member_file);
     $server2->DeleteFile($sv_iorfile);
+    $server2->DeleteFile($sv_statusfile);
 
     if ( -d $name_dir ) {
         print STDERR "INFO: removing <$name_dir>\n";
@@ -364,9 +368,9 @@ sub persistence_test ()
         print STDERR "ERROR: server returned $server_status\n";
         exit 1;
     }
-    if ($server2->WaitForFileTimed ($sv_iorfile,
+    if ($server2->WaitForFileTimed ($sv_statusfile,
                                    $server2->ProcessStartWaitInterval()) == -1) {
-        print STDERR "ERROR: cannot find file <$sv_iorfile>\n";
+        print STDERR "ERROR: cannot find file <$sv_statusfile>\n";
         $SV2->Kill (); $SV2->TimedWait (1);
         exit 1;
     }
@@ -506,9 +510,9 @@ sub backup_restore_test ()
         print STDERR "ERROR: server returned $server_status\n";
         exit 1;
     }
-    if ($server2->WaitForFileTimed ($sv_iorfile,
+    if ($server2->WaitForFileTimed ($sv_statusfile,
                                    $server2->ProcessStartWaitInterval()) == -1) {
-        print STDERR "ERROR: cannot find file <$sv_iorfile>\n";
+        print STDERR "ERROR: cannot find file <$sv_statusfile>\n";
         $SV2->Kill (); $SV2->TimedWait (1);
         exit 1;
     }
diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
index b107e6464e5..432ccae5558 100644
--- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
+++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/server.cpp
@@ -3,6 +3,8 @@
 #include "LB_server.h"
 #include "Basic.h"
 
+#include <iostream>
+
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
@@ -109,6 +111,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
           return 1;
         }
 
+      // Use status file instead of IOR to indicate server is ready
+      // as basic servant operations are done after server's IOR
+      // is written.
+      {
+        std::ofstream out ("server.status");
+        out << "started" << endl;
+      }
+
       lb_server.orb ()->run ();
 
       ACE_DEBUG ((LM_DEBUG,