From eef74e3a50e629bf1d022127667af8935096f573 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Fri, 19 Feb 2021 09:42:59 +0100 Subject: [PATCH] Fix flappy test --- scm-plugins/scm-git-plugin/build.gradle | 1 + .../sonia/scm/repository/spi/GitModifyCommandTest.java | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-git-plugin/build.gradle b/scm-plugins/scm-git-plugin/build.gradle index d1c5783d4d..7dd24303c7 100644 --- a/scm-plugins/scm-git-plugin/build.gradle +++ b/scm-plugins/scm-git-plugin/build.gradle @@ -38,6 +38,7 @@ dependencies { implementation libraries.commonsCompress testImplementation libraries.shiroUnit + testImplementation libraries.awaitility } scmPlugin { diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java index 8b785159cc..6c67f1e82b 100644 --- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java +++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitModifyCommandTest.java @@ -42,7 +42,10 @@ import java.io.File; import java.io.IOException; import java.nio.file.Files; +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static java.util.concurrent.TimeUnit.SECONDS; import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.description; import static org.mockito.Mockito.verify; @@ -347,7 +350,9 @@ public class GitModifyCommandTest extends GitModifyCommandTestBase { verify(transportProtocolRule.repositoryManager, description("pre receive hook event expected")) .fireHookEvent(argThat(argument -> argument.getType() == RepositoryHookType.PRE_RECEIVE)); - verify(transportProtocolRule.repositoryManager, description("post receive hook event expected")) - .fireHookEvent(argThat(argument -> argument.getType() == RepositoryHookType.POST_RECEIVE)); + await().pollInterval(50, MILLISECONDS).atMost(1, SECONDS).untilAsserted(() -> + verify(transportProtocolRule.repositoryManager, description("post receive hook event expected")) + .fireHookEvent(argThat(argument -> argument.getType() == RepositoryHookType.POST_RECEIVE)) + ); } }