Skip to content

Commit

Permalink
Merge pull request #118 from jewzaam/fix-hystrix-config-115
Browse files Browse the repository at this point in the history 
Fixes #115: set timeout for semaphore strategy
  • Loading branch information
@luan-cestari
luan-cestari committed Mar 18, 2015
2 parents 1f99ee3 + 30d5c9f commit df553a9
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion crud/src/test/resources/ITCaseCrudResourceRDBMSTest/config/config.properties
View file
Original file line number Diff line number Diff line change
@@ -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.strategy=SEMAPHORE
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000
2 changes: 1 addition & 1 deletion crud/src/test/resources/ITCaseCrudResourceTest/config/config.properties
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion crud/src/test/resources/it-rdbms/rdbms-config.properties
View file
Original file line number Diff line number Diff line change
@@ -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.strategy=SEMAPHORE
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000
3 changes: 2 additions & 1 deletion crud/src/test/resources/it/it-config.properties
View file
Original file line number Diff line number Diff line change
@@ -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.strategy=SEMAPHORE
hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=60000
1 change: 1 addition & 0 deletions metadata/src/test/resources/config.properties
View file
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit df553a9

Please sign in to comment.