This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new ce681de53 Relax the conditions for unit tests involving awaitility to
fix CI (#2293)
ce681de53 is described below
commit ce681de53d04667958e9aaccc77676f258b65b2e
Author: Ling Hengqian <[email protected]>
AuthorDate: Sun Oct 15 11:27:25 2023 +0800
Relax the conditions for unit tests involving awaitility to fix CI (#2293)
---
.../elasticjob/engine/integrate/disable/DisabledJobIntegrateTest.java | 2 +-
.../spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java | 2 +-
.../engine/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/DisabledJobIntegrateTest.java
b/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/DisabledJobIntegrateTest.java
index 195df8324..ddcc15c44 100644
---
a/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/DisabledJobIntegrateTest.java
+++
b/core/src/test/java/org/apache/shardingsphere/elasticjob/engine/integrate/disable/DisabledJobIntegrateTest.java
@@ -42,7 +42,7 @@ public abstract class DisabledJobIntegrateTest extends
BaseIntegrateTest {
}
protected final void assertDisabledRegCenterInfo() {
- Awaitility.await().atLeast(100L, TimeUnit.MILLISECONDS).atMost(1L,
TimeUnit.MINUTES).untilAsserted(() -> {
+ Awaitility.await().atLeast(1L, TimeUnit.MILLISECONDS).atMost(1L,
TimeUnit.MINUTES).untilAsserted(() -> {
assertThat(JobRegistry.getInstance().getCurrentShardingTotalCount(getJobName()),
is(3));
assertThat(JobRegistry.getInstance().getJobInstance(getJobName()).getServerIp(),
is(IpUtils.getIp()));
});
diff --git
a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java
b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java
index a5850543d..760d75dec 100644
---
a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java
+++
b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/job/OneOffJobSpringNamespaceWithTypeTest.java
@@ -52,6 +52,6 @@ class OneOffJobSpringNamespaceWithTypeTest extends
AbstractZookeeperJUnitJupiter
void jobScriptWithJobTypeTest() {
OneOffJobBootstrap bootstrap =
applicationContext.getBean(scriptJobName, OneOffJobBootstrap.class);
bootstrap.execute();
- Awaitility.await().atLeast(100L, TimeUnit.MILLISECONDS).atMost(1L,
TimeUnit.MINUTES).untilAsserted(() -> assertTrue(regCenter.isExisted("/" +
scriptJobName + "/sharding")));
+ Awaitility.await().atLeast(1L, TimeUnit.MILLISECONDS).atMost(1L,
TimeUnit.MINUTES).untilAsserted(() -> assertTrue(regCenter.isExisted("/" +
scriptJobName + "/sharding")));
}
}
diff --git
a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java
b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java
index 82fabe795..6ca092804 100644
---
a/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java
+++
b/spring/namespace/src/test/java/org/apache/shardingsphere/elasticjob/engine/spring/namespace/scanner/AbstractJobSpringIntegrateTest.java
@@ -59,7 +59,7 @@ public abstract class AbstractJobSpringIntegrateTest extends
AbstractZookeeperJU
}
private void assertSimpleElasticJobBean() {
- Awaitility.await().atMost(5L, TimeUnit.SECONDS).untilAsserted(() ->
assertThat(AnnotationSimpleJob.isCompleted(), is(true)));
+ Awaitility.await().atMost(10L, TimeUnit.SECONDS).untilAsserted(() ->
assertThat(AnnotationSimpleJob.isCompleted(), is(true)));
assertTrue(AnnotationSimpleJob.isCompleted());
assertTrue(regCenter.isExisted("/" + simpleJobName + "/sharding"));
}