diff options
| author | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-11 13:36:04 +0000 |
|---|---|---|
| committer | stanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2013-03-11 13:36:04 +0000 |
| commit | ff22079348275d015f467f08035898ca31dcd37d (patch) | |
| tree | 6972b68d986981bb9836d20c0223cbb5dec59a96 | |
| parent | b167acb0f0c39c07b03916b78cdc86cd4e2399de (diff) | |
| download | ATCD-ff22079348275d015f467f08035898ca31dcd37d.tar.gz | |
Added sleep to allow server replication to occur between bind and resolve.
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp | 25 |
2 files changed, 26 insertions, 6 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6162873931d..5501e8c1a00 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Mon Mar 11 13:33:14 UTC 2013 Kevin Stanley <stanleyk@ociweb.com> + + * orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp: + + Added sleep in test after first failure to allow time for the + replication to happen between redundant servers. + Mon Mar 11 13:17:41 UTC 2013 Byron Harris <harrisb@ociweb.com> * NEWS: diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index 820d6f85c13..4c2c7309bf7 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -578,7 +578,10 @@ do_failover_name_test ( catch (const CosNaming::NamingContext::NotFound& ex) { ex._tao_print_exception ( - ACE_TEXT ("INFO: Unable to resolve object from replica.\n")); + ACE_TEXT ("INFO: Unable to resolve object from replica. Sleeping for a second.\n")); + + // Give it a second to be processed + ACE_OS::sleep (1); // Try again... try { @@ -659,7 +662,9 @@ do_failover_name_test ( { ex._tao_print_exception ( ACE_TEXT ("INFO: Unable to resolve wide context object from ") - ACE_TEXT ("replica.\n")); + ACE_TEXT ("replica. Sleeping for a second.\n")); + + ACE_OS::sleep (1); // Try again to see if it just was a race condition try { @@ -1204,7 +1209,9 @@ do_persistence_name_test ( catch (const CosNaming::NamingContext::NotFound& ex) { ex._tao_print_exception ( - ACE_TEXT ("ERROR: Unable to resolve object from repository.\n")); + ACE_TEXT ("ERROR: Unable to resolve object from repository. Sleeping for a second.\n")); + + ACE_OS::sleep (1); // Try again... try { @@ -1290,7 +1297,9 @@ do_persistence_name_test ( { ex._tao_print_exception ( ACE_TEXT ("INFO: Unable to resolve wide context object from ") - ACE_TEXT ("repository.\n")); + ACE_TEXT ("repository. Sleeping for a second.\n")); + + ACE_OS::sleep (1); // Try again to see if it just was a race condition try { @@ -1779,7 +1788,9 @@ do_equivalence_name_test ( } catch (const CosNaming::NamingContext::NotFound& ex) { - ex._tao_print_exception ("INFO: Unable to resolve object from replica.\n"); + ex._tao_print_exception ("INFO: Unable to resolve object from replica. Sleeping for a second.\n"); + + ACE_OS::sleep (1); // Try again... try { @@ -1859,7 +1870,9 @@ do_equivalence_name_test ( { ex._tao_print_exception ( ACE_TEXT ("INFO: Unable to resolve wide context object from ") - ACE_TEXT ("replica.\n")); + ACE_TEXT ("replica. Sleeping for a second.\n")); + + ACE_OS::sleep (1); // Try again to see if it just was a race condition try { |