Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-07-02 21:18:05 +02:00
Code Issues Packages Projects Releases Activity

Handle resources, never left left opened file handler on windows (#1857)

Browse Source 
On windows unit tests are failing because junit checks if all @tempdir directries are empty and can be deleted after test run.
But due to opened file handles (not closed resource streams) Windows keeps files, which are "in use".
Linux is less strict in this area.
Additionally I want highlight that XMLStreamReaderImpl/XMLStreamWriterImpl from apache.xerces library (in OpenJDK11 at least) which are picked at runtime as xml parser implementation - they don't close associated resources.
BTW, I thing that relying on some runtime (sometimes - unpredictable) dependencies - is bad practice, but this it up to separate topic.
Additional fix: in IOUtil is file is locked (due to permissions or opened handle) - it will undlessly try-and-retry to delete it until end of the world, on windows.
This commit is contained in:
StNekroman
2021-11-22 11:22:46 +02:00
committed by GitHub
parent 47842cc071
commit b09284f1f5
12 changed files with 150 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scm-webapp/src/test/java/sonia/scm/update/repository/CopyMigrationStrategyTest.java
View File

@@ -91,14 +91,8 @@ class CopyMigrationStrategyTest {
}
private void assertDirectoriesEqual(Path targetDataDir, Path originalDataDir) {
Stream<Path> list = null;
try {
list = Files.list(originalDataDir);
} catch (IOException e) {
fail("could not read original directory", e);
}
list.forEach(
original -> {
try (Stream<Path> list = Files.list(originalDataDir)) {
list.forEach(original -> {
Path expectedTarget = targetDataDir.resolve(original.getFileName());
assertThat(expectedTarget).exists();
if (Files.isDirectory(original)) {
@@ -106,7 +100,9 @@ class CopyMigrationStrategyTest {
} else {
assertThat(expectedTarget).hasSameContentAs(original);
}
}
);
});
} catch (IOException e) {
fail("could not read original directory", e);
}
}
}

49
scm-webapp/src/test/java/sonia/scm/update/store/DifferentiateBetweenConfigAndConfigEntryUpdateStepTest.java
View File

@@ -29,6 +29,8 @@ import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URISyntaxException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -43,15 +45,16 @@ import static org.assertj.core.api.Assertions.assertThat;
class DifferentiateBetweenConfigAndConfigEntryUpdateStepTest {
@Test
void shouldNotModifyConfigFile(@TempDir Path temp) throws IOException {
void shouldNotModifyConfigFile(@TempDir Path temp) throws IOException, URISyntaxException {
Path configFile = temp.resolve("some.store.xml");
copy(
getResource("sonia/scm/update/store/config_file.xml.content"),
newOutputStream(configFile));
new DifferentiateBetweenConfigAndConfigEntryUpdateStep() {}.updateAllInDirectory(temp);
try (OutputStream os = newOutputStream(configFile)) {
copy(getResource("sonia/scm/update/store/config_file.xml.content"), os);
assertContent(configFile, "sonia/scm/update/store/config_file.xml.content");
new DifferentiateBetweenConfigAndConfigEntryUpdateStep() {}.updateAllInDirectory(temp);
assertContent(configFile, "sonia/scm/update/store/config_file.xml.content");
}
}
@Test
@@ -77,33 +80,35 @@ class DifferentiateBetweenConfigAndConfigEntryUpdateStepTest {
}
@Test
void shouldIgnoreFilesWithoutXmlSuffix(@TempDir Path temp) throws IOException {
void shouldIgnoreFilesWithoutXmlSuffix(@TempDir Path temp) throws IOException, URISyntaxException {
Path otherFile = temp.resolve("some.other.file");
copy(
getResource("sonia/scm/update/store/config_entry_file_without_mark.xml.content"),
newOutputStream(otherFile));
new DifferentiateBetweenConfigAndConfigEntryUpdateStep() {}.updateAllInDirectory(temp);
try (OutputStream os = newOutputStream(otherFile)) {
copy(getResource("sonia/scm/update/store/config_entry_file_without_mark.xml.content"), os);
assertContent(otherFile, "sonia/scm/update/store/config_entry_file_without_mark.xml.content");
new DifferentiateBetweenConfigAndConfigEntryUpdateStep() {}.updateAllInDirectory(temp);
assertContent(otherFile, "sonia/scm/update/store/config_entry_file_without_mark.xml.content");
}
}
@Test
void shouldHandleConfigEntryFile(@TempDir Path temp) throws IOException {
void shouldHandleConfigEntryFile(@TempDir Path temp) throws IOException, URISyntaxException {
Path configFile = temp.resolve("some.store.xml");
copy(
getResource("sonia/scm/update/store/config_entry_file_without_mark.xml.content"),
newOutputStream(configFile));
new DifferentiateBetweenConfigAndConfigEntryUpdateStep() {}.updateAllInDirectory(temp);
try (OutputStream os = newOutputStream(configFile)) {
copy(getResource("sonia/scm/update/store/config_entry_file_without_mark.xml.content"), os);
assertThat(Files.readAllLines(configFile))
.areAtLeastOne(new Condition<>(line -> line.contains("<configuration type=\"config-entry\">"), "line containing start tag with attribute"))
.endsWith(Files.readAllLines(Paths.get(getResource("sonia/scm/update/store/config_entry_file.xml.content").getFile())).toArray(new String[9]));
new DifferentiateBetweenConfigAndConfigEntryUpdateStep() {}.updateAllInDirectory(temp);
assertThat(Files.readAllLines(configFile))
.areAtLeastOne(new Condition<>(line -> line.contains("<configuration type=\"config-entry\">"), "line containing start tag with attribute"))
.endsWith(Files.readAllLines(Paths.get(getResource("sonia/scm/update/store/config_entry_file.xml.content").toURI())).toArray(new String[9]));
}
}
private void assertContent(Path configFile, String expectedContentResource) {
private void assertContent(Path configFile, String expectedContentResource) throws URISyntaxException {
assertThat(configFile)
.hasSameTextualContentAs(Paths.get(getResource(expectedContentResource).getFile()));
.hasSameTextualContentAs(Paths.get(getResource(expectedContentResource).toURI()));
}
}