From bbad0ceaa9d323b372607dd0ea906dd1eac5e6a5 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Wed, 8 Apr 2026 13:54:53 +0200 Subject: [PATCH] Tets change, check size of cache before calling the second server * TAO/tests/Transport_Idle_Timeout/Echo_i.cpp: * TAO/tests/Transport_Idle_Timeout/client_multiple.cpp: --- TAO/tests/Transport_Idle_Timeout/Echo_i.cpp | 6 ++---- TAO/tests/Transport_Idle_Timeout/client_multiple.cpp | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/TAO/tests/Transport_Idle_Timeout/Echo_i.cpp b/TAO/tests/Transport_Idle_Timeout/Echo_i.cpp index 53b4078ecbb06..8e9c1726c83ca 100644 --- a/TAO/tests/Transport_Idle_Timeout/Echo_i.cpp +++ b/TAO/tests/Transport_Idle_Timeout/Echo_i.cpp @@ -61,6 +61,8 @@ Echo_i::ping (::CORBA::Long sleep_time, ::CORBA::Long cache_size_expected, ::Tes bool ok = true; sleep_with_reactor (this->orb_, sleep_time); + ok &= check ("ping", cache_size(this->orb_), cache_size_expected); + if (!CORBA::is_nil(server)) { ACE_DEBUG ((LM_DEBUG, @@ -72,10 +74,6 @@ Echo_i::ping (::CORBA::Long sleep_time, ::CORBA::Long cache_size_expected, ::Tes } ok &= check ("ping_second", cache_size(this->orb_), cache_size_expected_in_server1); } - else - { - ok &= check ("ping", cache_size(this->orb_), cache_size_expected); - } return ok; } diff --git a/TAO/tests/Transport_Idle_Timeout/client_multiple.cpp b/TAO/tests/Transport_Idle_Timeout/client_multiple.cpp index 0d6625ae98c3f..0107834843267 100644 --- a/TAO/tests/Transport_Idle_Timeout/client_multiple.cpp +++ b/TAO/tests/Transport_Idle_Timeout/client_multiple.cpp @@ -141,7 +141,7 @@ tc1_basic_idle_close (CORBA::ORB_ptr orb, Test::Echo_ptr echo, Test::Echo_ptr ec bool ok = true; // --- Step 1: establish a transport --- - ok &= echo->ping (0, 2, echo2, 0, 2, 1); + ok &= echo->ping (0, 1, echo2, 0, 2, 1); ok &= check ("TC-1 after ping (expect 1)", cache_size(orb), 1); @@ -159,7 +159,7 @@ tc1_basic_idle_close (CORBA::ORB_ptr orb, Test::Echo_ptr echo, Test::Echo_ptr ec // Make another call, but let wait sleep_sec after the ping to the second server, // which means the call takes longer as the idle time. - ok &= echo->ping (0, 2, echo2, sleep_sec, 0, 0); + ok &= echo->ping (0, 1, echo2, sleep_sec, 0, 0); ok &= check ("TC-1 after ping longer as timeout (expect 1)", cache_size(orb), 1); @@ -186,7 +186,7 @@ tc2_reconnect (CORBA::ORB_ptr orb, Test::Echo_ptr echo, Test::Echo_ptr echo2) // A new ping must succeed without TRANSIENT even though TC-1 caused the // server to close the connection. TAO's reconnect logic handles this. - ok &= echo->ping (0, 2, echo2, 0, 2, 1); + ok &= echo->ping (0, 1, echo2, 0, 2, 1); ok &= check ("TC-2 after reconnect ping (expect 1)", cache_size(orb), 1);