THRIFT-4739: fix concurrency_test (test-only fix)
diff --git a/appveyor.yml b/appveyor.yml
index 2dee45f..39aba4f 100755
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -45,7 +45,7 @@
PYTHON_VERSION: 3.6
QT_VERSION: 5.10
ZLIB_VERSION: 1.2.11
- DISABLED_TESTS: (concurrency_test|StressTestNonBlocking)
+ DISABLED_TESTS: (StressTestNonBlocking)
- PROFILE: MSVC2015
PLATFORM: x86
@@ -56,18 +56,18 @@
PYTHON_VERSION: 3.5
QT_VERSION: 5.8
ZLIB_VERSION: 1.2.8
- DISABLED_TESTS: (concurrency_test|StressTestNonBlocking)
+ DISABLED_TESTS: (StressTestNonBlocking)
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
- PROFILE: MINGW
PLATFORM: x64
CONFIGURATION: RelWithDebInfo
- DISABLED_TESTS: (concurrency_test|StressTestNonBlocking)
+ DISABLED_TESTS: (StressTestNonBlocking)
- PROFILE: CYGWIN
PLATFORM: x64
CONFIGURATION: RelWithDebInfo
- DISABLED_TESTS: (concurrency_test|ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
+ DISABLED_TESTS: (ZlibTest|OpenSSLManualInitTest|TNonblockingServerTest|StressTestNonBlocking)
install:
- cd %APPVEYOR_BUILD_FOLDER%
diff --git a/lib/cpp/test/concurrency/TimerManagerTests.h b/lib/cpp/test/concurrency/TimerManagerTests.h
index 313572a..2d1a262 100644
--- a/lib/cpp/test/concurrency/TimerManagerTests.h
+++ b/lib/cpp/test/concurrency/TimerManagerTests.h
@@ -22,6 +22,8 @@
#include <thrift/concurrency/Monitor.h>
#include <assert.h>
+#include <chrono>
+#include <thread>
#include <iostream>
namespace apache {
@@ -223,7 +225,7 @@
}
/**
- * This test creates one tasks, and tries to remove it after it has expired.
+ * This test creates one task, and tries to remove it after it has expired.
*/
bool test04(uint64_t timeout = 1000LL) {
TimerManager timerManager;
@@ -237,15 +239,24 @@
shared_ptr<TimerManagerTests::Task> task
= shared_ptr<TimerManagerTests::Task>(new TimerManagerTests::Task(_monitor, timeout / 10));
TimerManager::Timer timer = timerManager.add(task, task->_timeout);
+ task.reset();
// Wait until the task has completed
_monitor.wait(timeout);
// Verify behavior when removing the expired task
- try {
- timerManager.remove(timer);
- assert(nullptr == "ERROR: This remove should send a NoSuchTaskException exception.");
- } catch (NoSuchTaskException&) {
+ // notify is called inside the task so the task may still
+ // be running when we get here, so we need to loop...
+ for (;;) {
+ try {
+ timerManager.remove(timer);
+ assert(nullptr == "ERROR: This remove should throw NoSuchTaskException, or UncancellableTaskException.");
+ } catch (const NoSuchTaskException&) {
+ break;
+ } catch (const UncancellableTaskException&) {
+ // the thread was still exiting; try again...
+ std::this_thread::sleep_for(std::chrono::milliseconds(1));
+ }
}
return true;