From 30d5c9fc7d19d78a666cd639f9fb7b68d772aac3 Mon Sep 17 00:00:00 2001 From: Naveen Malik Date: Tue, 17 Mar 2015 22:24:16 -0400 Subject: [PATCH] Fixes #115: set timeout for semaphore strategy --- .../ITCaseCrudResourceRDBMSTest/config/config.properties | 3 ++- .../resources/ITCaseCrudResourceTest/config/config.properties | 2 +- crud/src/test/resources/it-rdbms/rdbms-config.properties | 3 ++- crud/src/test/resources/it/it-config.properties | 3 ++- metadata/src/test/resources/config.properties | 1 + 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/crud/src/test/resources/ITCaseCrudResourceRDBMSTest/config/config.properties b/crud/src/test/resources/ITCaseCrudResourceRDBMSTest/config/config.properties index 0ee5d4f2..b34c70c5 100644 --- a/crud/src/test/resources/ITCaseCrudResourceRDBMSTest/config/config.properties +++ b/crud/src/test/resources/ITCaseCrudResourceRDBMSTest/config/config.properties @@ -1,3 +1,4 @@ # set default isolation strategy for tests to SEMAPHORE else breakpoints in IDE # when debugging unit tests will timeout with default strategy (THREAD). -hystrix.command.default.execution.isolation.strategy=SEMAPHORE \ No newline at end of file +hystrix.command.default.execution.isolation.strategy=SEMAPHORE +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000 diff --git a/crud/src/test/resources/ITCaseCrudResourceTest/config/config.properties b/crud/src/test/resources/ITCaseCrudResourceTest/config/config.properties index 962a72f6..b34c70c5 100644 --- a/crud/src/test/resources/ITCaseCrudResourceTest/config/config.properties +++ b/crud/src/test/resources/ITCaseCrudResourceTest/config/config.properties @@ -1,4 +1,4 @@ # set default isolation strategy for tests to SEMAPHORE else breakpoints in IDE # when debugging unit tests will timeout with default strategy (THREAD). hystrix.command.default.execution.isolation.strategy=SEMAPHORE - +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000 diff --git a/crud/src/test/resources/it-rdbms/rdbms-config.properties b/crud/src/test/resources/it-rdbms/rdbms-config.properties index 0ee5d4f2..b34c70c5 100644 --- a/crud/src/test/resources/it-rdbms/rdbms-config.properties +++ b/crud/src/test/resources/it-rdbms/rdbms-config.properties @@ -1,3 +1,4 @@ # set default isolation strategy for tests to SEMAPHORE else breakpoints in IDE # when debugging unit tests will timeout with default strategy (THREAD). -hystrix.command.default.execution.isolation.strategy=SEMAPHORE \ No newline at end of file +hystrix.command.default.execution.isolation.strategy=SEMAPHORE +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000 diff --git a/crud/src/test/resources/it/it-config.properties b/crud/src/test/resources/it/it-config.properties index 0ee5d4f2..b34c70c5 100644 --- a/crud/src/test/resources/it/it-config.properties +++ b/crud/src/test/resources/it/it-config.properties @@ -1,3 +1,4 @@ # set default isolation strategy for tests to SEMAPHORE else breakpoints in IDE # when debugging unit tests will timeout with default strategy (THREAD). -hystrix.command.default.execution.isolation.strategy=SEMAPHORE \ No newline at end of file +hystrix.command.default.execution.isolation.strategy=SEMAPHORE +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000 diff --git a/metadata/src/test/resources/config.properties b/metadata/src/test/resources/config.properties index cfd0006a..b34c70c5 100644 --- a/metadata/src/test/resources/config.properties +++ b/metadata/src/test/resources/config.properties @@ -1,3 +1,4 @@ # set default isolation strategy for tests to SEMAPHORE else breakpoints in IDE # when debugging unit tests will timeout with default strategy (THREAD). hystrix.command.default.execution.isolation.strategy=SEMAPHORE +hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000