diff options
| author | Jose <jose@zeroc.com> | 2016-07-12 08:10:01 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-12 08:10:01 +0200 |
| commit | ed1d54e2bfbb0913eaf68941ff08490d459a080e (patch) | |
| tree | 1fe6ed4e1576ea5e5c140246b5d03cb216d1d0f0 | |
| parent | CSharp updates for Visual Studio 2013 compatibility (diff) | |
| parent | IceSSL/configuration bogus property (diff) | |
| download | ice-3.7.0-alpha2.tar.bz2 ice-3.7.0-alpha2.tar.xz ice-3.7.0-alpha2.zip | |
Merge remote-tracking branch 'origin/3.6'v3.7.0-alpha2
| -rw-r--r-- | cpp/test/Glacier2/override/Client.cpp | 9 | ||||
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/cpp/test/Glacier2/override/Client.cpp b/cpp/test/Glacier2/override/Client.cpp index 443f18a5900..651cc31883b 100644 --- a/cpp/test/Glacier2/override/Client.cpp +++ b/cpp/test/Glacier2/override/Client.cpp @@ -187,7 +187,14 @@ CallbackClient::run(int, char**) IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200)); callbackReceiverImpl->activate(); test(callbackReceiverImpl->callbackWithPayloadOK(3) == 0); - test(callbackReceiverImpl->callbackOK(1, 0) == 0); + remainingCallbacks = callbackReceiverImpl->callbackOK(1, 0); + // Unlikely but sometime we get more than just one callback if the flush + // occurs in the middle of our 5 callbacks. + test(remainingCallbacks <= 3); + if(remainingCallbacks > 0) + { + test(callbackReceiverImpl->callbackOK(remainingCallbacks, 0) == 0); + } cout << "ok" << endl; } diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 66c29fb1404..7261fdfbd8f 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -1947,7 +1947,6 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // // With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers // - d["IceSSL.SecurityLevel"] = "0"; string cipherSub = "ADH-"; d["IceSSL.Ciphers"] = "RSA:" + anonCiphers; # else |