diff options
author | Benoit Foucher <benoit@zeroc.com> | 2009-03-11 11:01:05 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2009-03-11 11:01:05 +0100 |
commit | 86d80e14940b56e162fef6c1b99dbbc8f22e5417 (patch) | |
tree | e3416360a65857e89aa88748e93501b9574b5299 | |
parent | - Fixed bug where Connection::close(false) could hang for some time (diff) | |
download | ice-86d80e14940b56e162fef6c1b99dbbc8f22e5417.tar.bz2 ice-86d80e14940b56e162fef6c1b99dbbc8f22e5417.tar.xz ice-86d80e14940b56e162fef6c1b99dbbc8f22e5417.zip |
Fixed bug 3806 - location test failure
-rw-r--r-- | cpp/test/Ice/location/AllTests.cpp | 12 | ||||
-rw-r--r-- | cs/test/Ice/location/AllTests.cs | 12 | ||||
-rw-r--r-- | java/test/Ice/location/AllTests.java | 12 |
3 files changed, 30 insertions, 6 deletions
diff --git a/cpp/test/Ice/location/AllTests.cpp b/cpp/test/Ice/location/AllTests.cpp index 34dde6d05d3..5bb637de642 100644 --- a/cpp/test/Ice/location/AllTests.cpp +++ b/cpp/test/Ice/location/AllTests.cpp @@ -325,7 +325,11 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) hello->sayHello_async(new AMICallback()); } hello->ice_ping(); - test(locator->getRequestCount() > count && locator->getRequestCount() < count + 500); + test(locator->getRequestCount() > count && locator->getRequestCount() < count + 999); + if(locator->getRequestCount() > count + 800) + { + cout << "queuing = " << locator->getRequestCount() - count; + } count = locator->getRequestCount(); hello = hello->ice_adapterId("unknown"); for(i = 0; i < 1000; i++) @@ -355,7 +359,11 @@ allTests(const Ice::CommunicatorPtr& communicator, const string& ref) catch(const Ice::NotRegisteredException&) { } - test(locator->getRequestCount() > count && locator->getRequestCount() < count + 500); + test(locator->getRequestCount() > count && locator->getRequestCount() < count + 999); + if(locator->getRequestCount() > count + 800) + { + cout << "queuing = " << locator->getRequestCount() - count; + } cout << "ok" << endl; cout << "testing adapter locator cache... " << flush; diff --git a/cs/test/Ice/location/AllTests.cs b/cs/test/Ice/location/AllTests.cs index e4be8eedea5..0c6bdce8522 100644 --- a/cs/test/Ice/location/AllTests.cs +++ b/cs/test/Ice/location/AllTests.cs @@ -328,7 +328,11 @@ public class AllTests hello.sayHello_async(new AMICallbackResponse()); } hello.ice_ping(); - test(locator.getRequestCount() > count && locator.getRequestCount() < count + 500); + test(locator.getRequestCount() > count && locator.getRequestCount() < count + 999); + if(locator.getRequestCount() > count + 800) + { + Console.Out.Write("queuing = " + (locator.getRequestCount() - count)); + } count = locator.getRequestCount(); hello = (HelloPrx)hello.ice_adapterId("unknown"); for(int i = 0; i < 1000; i++) @@ -343,7 +347,11 @@ public class AllTests catch(Ice.NotRegisteredException) { } - test(locator.getRequestCount() > count && locator.getRequestCount() < count + 500); + test(locator.getRequestCount() > count && locator.getRequestCount() < count + 999); + if(locator.getRequestCount() > count + 800) + { + Console.Out.Write("queuing = " + (locator.getRequestCount() - count)); + } Console.Out.WriteLine("ok"); Console.Out.Write("testing adapter locator cache... "); diff --git a/java/test/Ice/location/AllTests.java b/java/test/Ice/location/AllTests.java index 264022848e0..df1544e9038 100644 --- a/java/test/Ice/location/AllTests.java +++ b/java/test/Ice/location/AllTests.java @@ -331,7 +331,11 @@ public class AllTests hello.sayHello_async(new AMICallback()); } hello.ice_ping(); - test(locator.getRequestCount() > count && locator.getRequestCount() < count + 500); + test(locator.getRequestCount() > count && locator.getRequestCount() < count + 999); + if(locator.getRequestCount() > count + 800) + { + System.out.print("queuing = " + (locator.getRequestCount() - count)); + } count = locator.getRequestCount(); hello = (HelloPrx)hello.ice_adapterId("unknown"); for(int i = 0; i < 1000; i++) @@ -360,7 +364,11 @@ public class AllTests catch(Ice.NotRegisteredException ex) { } - test(locator.getRequestCount() > count && locator.getRequestCount() < count + 500); + test(locator.getRequestCount() > count && locator.getRequestCount() < count + 999); + if(locator.getRequestCount() > count + 800) + { + System.out.print("queuing = " + (locator.getRequestCount() - count)); + } System.out.println("ok"); System.out.print("testing adapter locator cache... "); |