Details
diff --git a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
index 2fc2626..d5c1aa5 100644
--- a/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
+++ b/payment/src/test/java/org/killbill/billing/payment/api/TestPaymentApi.java
@@ -876,7 +876,7 @@ public class TestPaymentApi extends PaymentTestSuiteWithEmbeddedDB {
final String pluginName = mockPaymentProviderPlugin.PLUGIN_NAME;
- mockPaymentProviderPlugin.makePluginWaitSomeMilliseconds(1100);
+ mockPaymentProviderPlugin.makePluginWaitSomeMilliseconds((int) (paymentConfig.getPaymentPluginTimeout().getMillis() + 100));
SpyLogger spyLogger = withSpyLogger(OperationCallbackBase.class, new Callable<Void>() {
diff --git a/payment/src/test/java/org/killbill/billing/payment/dispatcher/TestPluginDispatcher.java b/payment/src/test/java/org/killbill/billing/payment/dispatcher/TestPluginDispatcher.java
index ad324a9..06077cc 100644
--- a/payment/src/test/java/org/killbill/billing/payment/dispatcher/TestPluginDispatcher.java
+++ b/payment/src/test/java/org/killbill/billing/payment/dispatcher/TestPluginDispatcher.java
@@ -53,7 +53,7 @@ public class TestPluginDispatcher extends PaymentTestSuiteNoDB {
voidPluginDispatcher.dispatchWithTimeout(new Callable<PluginDispatcherReturnType<Void>>() {
@Override
public PluginDispatcherReturnType<Void> call() throws Exception {
- Thread.sleep(1000);
+ Thread.sleep(paymentConfig.getPaymentPluginTimeout().getMillis() + 100);
return null;
}
}, 100, TimeUnit.MILLISECONDS);
diff --git a/payment/src/test/resources/payment.properties b/payment/src/test/resources/payment.properties
index 7314dfa..8b77678 100644
--- a/payment/src/test/resources/payment.properties
+++ b/payment/src/test/resources/payment.properties
@@ -1,4 +1,4 @@
org.killbill.payment.failure.retry.start.sec=3600
org.killbill.payment.failure.retry.multiplier=1
org.killbill.payment.failure.retry.max.attempts=3
-org.killbill.payment.plugin.timeout=1s
+org.killbill.payment.plugin.timeout=2s
