Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-10-26 16:16:10 +01:00
Code Issues Packages Projects Releases Activity

Retry failing integration tests

Browse Source 
This uses 'RetryingTest' from junit jupiter to retry integration tests that are known to fail from time to time. We explicitly mark single tests in contrast to set a global retry to be able to trace those, whenever this is intended.

To do so, we have to update to the latest version of JUnit. Unfortunately, this brought a new behaviour for the @TempDir annotation: In contrast to the former behaviour where for one test all annotated parameters got the same directory, in the new version the parameters get different directories assigned. This led to the need of some consolidation between @BeforeEach methods and the related tests.

Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: René Pfeuffer <rene.pfeuffer@cloudogu.com>
This commit is contained in:
Rene Pfeuffer
2023-03-22 06:24:33 +01:00
committed by SCM-Manager
parent 796330f883
commit 68110ee6b3
17 changed files with 133 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scm-dao-xml/src/test/java/sonia/scm/store/JAXBPropertyFileAccessTest.java
View File

@@ -61,8 +61,11 @@ class JAXBPropertyFileAccessTest {
JAXBPropertyFileAccess fileAccess;
@TempDir
private Path tempDir;
@BeforeEach
void initTempDir(@TempDir Path tempDir) {
void initTempDir() {
lenient().when(contextProvider.getBaseDirectory()).thenReturn(tempDir.toFile());
lenient().when(contextProvider.resolve(any())).thenAnswer(invocation -> tempDir.resolve(invocation.getArgument(0).toString()));
@@ -98,8 +101,8 @@ class JAXBPropertyFileAccessTest {
}
@Test
void shouldMoveStoreFileToRepositoryBasedLocation(@TempDir Path tempDir) throws IOException {
createV1StoreFile(tempDir, "myStore.xml");
void shouldMoveStoreFileToRepositoryBasedLocation() throws IOException {
createV1StoreFile("myStore.xml");
fileAccess.forStoreName(STORE_NAME).moveAsRepositoryStore(Paths.get("myStore.xml"), REPOSITORY_ID);
@@ -107,11 +110,11 @@ class JAXBPropertyFileAccessTest {
}
@Test
void shouldMoveAllStoreFilesToRepositoryBasedLocations(@TempDir Path tempDir) throws IOException {
void shouldMoveAllStoreFilesToRepositoryBasedLocations() throws IOException {
locationResolver.forClass(Path.class).createLocation("repoId2");
createV1StoreFile(tempDir, REPOSITORY_ID + ".xml");
createV1StoreFile(tempDir, "repoId2.xml");
createV1StoreFile(REPOSITORY_ID + ".xml");
createV1StoreFile("repoId2.xml");
PropertyFileAccess.StoreFileTools statisticStoreAccess = fileAccess.forStoreName(STORE_NAME);
statisticStoreAccess.forStoreFiles(statisticStoreAccess::moveAsRepositoryStore);
@@ -121,7 +124,7 @@ class JAXBPropertyFileAccessTest {
}
}
private void createV1StoreFile(@TempDir Path tempDir, String name) throws IOException {
private void createV1StoreFile(String name) throws IOException {
Path v1Dir = tempDir.resolve("var").resolve("data").resolve(STORE_NAME);
IOUtil.mkdirs(v1Dir.toFile());
Files.createFile(v1Dir.resolve(name));
@@ -131,8 +134,8 @@ class JAXBPropertyFileAccessTest {
class ForMissingRepository {
@Test
void shouldIgnoreStoreFile(@TempDir Path tempDir) throws IOException {
createV1StoreFile(tempDir, "myStore.xml");
void shouldIgnoreStoreFile() throws IOException {
createV1StoreFile("myStore.xml");
fileAccess.forStoreName(STORE_NAME).moveAsRepositoryStore(Paths.get("myStore.xml"), REPOSITORY_ID);