summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelliott_c <ocielliottc@users.noreply.github.com>2004-11-09 14:28:27 +0000
committerelliott_c <ocielliottc@users.noreply.github.com>2004-11-09 14:28:27 +0000
commit819410793ab888ac55a969cdee44d5649a972f06 (patch)
treef2d99d8bc89b153b8b04ff2314ec90ecc419dd4d
parentabe51bc81c0ff1d80e5a4925e0c7449599078bc7 (diff)
downloadATCD-819410793ab888ac55a969cdee44d5649a972f06.tar.gz
ChangeLogTag: Tue Nov 9 08:27:30 2004 Chad Elliott <elliott_c@ociweb.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tests/AMI_Buffering/client.cpp7
2 files changed, 12 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 11a3a33f67c..43ba7913133 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 9 08:27:30 2004 Chad Elliott <elliott_c@ociweb.com>
+
+ * tests/AMI_Buffering/client.cpp:
+
+ Increased the amount of time allowed to elapse before the flush
+ occurs due to differences in OS schedulers.
+
Tue Nov 9 07:22:46 2004 Chad Elliott <elliott_c@ociweb.com>
* orbsvcs/tests/HTIOP/AMI/HTIOP_AMI.mpc:
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 856abb57673..a17ba653fd5 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -738,7 +738,10 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
break;
}
- if (elapsed.msec () > 2 * TIMEOUT_MILLISECONDS)
+ // Slightly more than the timeout is allowed to pass due
+ // to scheduler differences.
+ static const unsigned int real_timeout = 3 * TIMEOUT_MILLISECONDS;
+ if (elapsed.msec () > real_timeout)
{
test_failed = 1;
ACE_DEBUG ((LM_DEBUG,
@@ -746,7 +749,7 @@ run_timeout_reactive (CORBA::ORB_ptr orb,
"timeout threshold. "
"Elapsed = %d, Timeout = %d msecs\n",
i,
- elapsed.msec (), TIMEOUT_MILLISECONDS));
+ elapsed.msec (), real_timeout));
break;
}
}