Browse Source
Merge pull request #15454 from smatvienko-tb/fix/flaky-TbRestApiCallNodeTest-ssrf-lock
Fix flaky TbRestApiCallNodeTest via SsrfProtectionValidator ResourceLock
pull/15463/head
Viacheslav Klimov
1 month ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with
2 additions and
0 deletions
-
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
|
|
|
@ -27,6 +27,7 @@ import org.apache.http.protocol.HttpRequestHandler; |
|
|
|
import org.junit.jupiter.api.AfterEach; |
|
|
|
import org.junit.jupiter.api.Test; |
|
|
|
import org.junit.jupiter.api.extension.ExtendWith; |
|
|
|
import org.junit.jupiter.api.parallel.ResourceLock; |
|
|
|
import org.junit.jupiter.params.ParameterizedTest; |
|
|
|
import org.junit.jupiter.params.provider.Arguments; |
|
|
|
import org.junit.jupiter.params.provider.ValueSource; |
|
|
|
@ -70,6 +71,7 @@ import static org.mockito.Mockito.timeout; |
|
|
|
import static org.mockito.Mockito.verify; |
|
|
|
|
|
|
|
@ExtendWith(MockitoExtension.class) |
|
|
|
@ResourceLock("SsrfProtectionValidator") // to avoid race conditions when modifying SsrfProtectionValidator's static configuration
|
|
|
|
public class TbRestApiCallNodeTest extends AbstractRuleNodeUpgradeTest { |
|
|
|
|
|
|
|
static final long TIMEOUT = TimeUnit.SECONDS.toMillis(30); |
|
|
|
|