Skip to content

Commit 351255f

Browse files
committed
Fix integration test retry extension
The integration tests were using a retry extension that was eating exceptions and hiding failures. This commit updates the extension to retry and still report failed tests. Signed-off-by: Hal Spang <[email protected]>
1 parent 402b88e commit 351255f

File tree

5 files changed

+77
-135
lines changed

5 files changed

+77
-135
lines changed

client/src/test/java/com/microsoft/durabletask/ErrorHandlingIntegrationTests.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@
2727
@Tag("integration")
2828
@ExtendWith(TestRetryExtension.class)
2929
public class ErrorHandlingIntegrationTests extends IntegrationTestBase {
30+
3031
@BeforeEach
3132
private void startUp() {
32-
DurableTaskClient client = new DurableTaskGrpcClientBuilder().build();
33-
client.deleteTaskHub();
33+
try(DurableTaskClient client = new DurableTaskGrpcClientBuilder().build()) {
34+
client.deleteTaskHub();
35+
}
3436
}
3537

36-
@RetryingTest
38+
@Test
3739
void orchestratorException() throws TimeoutException {
3840
final String orchestratorName = "OrchestratorWithException";
3941
final String errorMessage = "Kah-BOOOOOM!!!";
@@ -59,7 +61,7 @@ void orchestratorException() throws TimeoutException {
5961
}
6062
}
6163

62-
@RetryingParameterizedTest
64+
@ParameterizedTest
6365
@ValueSource(booleans = {true, false})
6466
void activityException(boolean handleException) throws TimeoutException {
6567
final String orchestratorName = "OrchestratorWithActivityException";
@@ -111,7 +113,7 @@ void activityException(boolean handleException) throws TimeoutException {
111113
}
112114
}
113115

114-
@RetryingParameterizedTest
116+
@ParameterizedTest
115117
@ValueSource(ints = {1, 2, 10})
116118
public void retryActivityFailures(int maxNumberOfAttempts) throws TimeoutException {
117119
// There is one task for each activity call and one task between each retry
@@ -125,7 +127,7 @@ public void retryActivityFailures(int maxNumberOfAttempts) throws TimeoutExcepti
125127
});
126128
}
127129

128-
@RetryingParameterizedTest
130+
@ParameterizedTest
129131
@ValueSource(ints = {1, 2, 10})
130132
public void retryActivityFailuresWithCustomLogic(int maxNumberOfAttempts) throws TimeoutException {
131133
// This gets incremented every time the retry handler is invoked
@@ -142,7 +144,7 @@ public void retryActivityFailuresWithCustomLogic(int maxNumberOfAttempts) throws
142144
assertEquals(maxNumberOfAttempts, retryHandlerCalls.get());
143145
}
144146

145-
@RetryingParameterizedTest
147+
@ParameterizedTest
146148
@ValueSource(booleans = {true, false})
147149
void subOrchestrationException(boolean handleException) throws TimeoutException {
148150
final String orchestratorName = "OrchestrationWithBustedSubOrchestrator";
@@ -192,7 +194,7 @@ void subOrchestrationException(boolean handleException) throws TimeoutException
192194
}
193195
}
194196

195-
@RetryingParameterizedTest
197+
@ParameterizedTest
196198
@ValueSource(ints = {1, 2, 10})
197199
public void retrySubOrchestratorFailures(int maxNumberOfAttempts) throws TimeoutException {
198200
// There is one task for each sub-orchestrator call and one task between each retry
@@ -207,7 +209,7 @@ public void retrySubOrchestratorFailures(int maxNumberOfAttempts) throws Timeout
207209
});
208210
}
209211

210-
@RetryingParameterizedTest
212+
@ParameterizedTest
211213
@ValueSource(ints = {1, 2, 10})
212214
public void retrySubOrchestrationFailuresWithCustomLogic(int maxNumberOfAttempts) throws TimeoutException {
213215
// This gets incremented every time the retry handler is invoked

0 commit comments

Comments
 (0)