stepus53/dhfs
1
0
Fork 0
mirror of https://github.com/usatiuk/dhfs.git synced 2025-10-29 04:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Server: fix not being able to delete temp dir in tests

Browse Source
This commit is contained in:
Stepan Usatiuk
2025-04-13 20:05:51 +02:00
parent a5727c01b1
commit 83e0f6eb0a
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/server.yml vendored
View File

@@ -49,7 +49,7 @@ jobs:
cache: maven cache: maven
- name: Test with Maven - name: Test with Maven
run: cd dhfs-parent && mvn -T $(nproc) --batch-mode --update-snapshots package verify run: cd dhfs-parent && TESTCONTAINERS_USER="$(id -u):$(id -g)" mvn -T $(nproc) --batch-mode --update-snapshots package verify
# - name: Build with Maven # - name: Build with Maven
# run: cd dhfs-parent && mvn --batch-mode --update-snapshots package # -Dquarkus.log.category.\"com.usatiuk.dhfs\".min-level=DEBUG # run: cd dhfs-parent && mvn --batch-mode --update-snapshots package # -Dquarkus.log.category.\"com.usatiuk.dhfs\".min-level=DEBUG

9
dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/KillIT.java
View File

@@ -43,16 +43,25 @@ public class KillIT {
@BeforeEach @BeforeEach
void setup(TestInfo testInfo) throws IOException, InterruptedException, TimeoutException { void setup(TestInfo testInfo) throws IOException, InterruptedException, TimeoutException {
Network network = Network.newNetwork(); Network network = Network.newNetwork();
String testcontainersUser = System.getenv("TESTCONTAINERS_USER");
container1 = new GenericContainer<>(DhfsImage.getInstance()) container1 = new GenericContainer<>(DhfsImage.getInstance())
.withPrivilegedMode(true) .withPrivilegedMode(true)
.withCreateContainerCmdModifier(cmd -> Objects.requireNonNull(cmd.getHostConfig()).withDevices(Device.parse("/dev/fuse"))) .withCreateContainerCmdModifier(cmd -> Objects.requireNonNull(cmd.getHostConfig()).withDevices(Device.parse("/dev/fuse")))
.waitingFor(Wait.forLogMessage(".*Listening.*", 1).withStartupTimeout(Duration.ofSeconds(60))).withNetwork(network) .waitingFor(Wait.forLogMessage(".*Listening.*", 1).withStartupTimeout(Duration.ofSeconds(60))).withNetwork(network)
.withFileSystemBind(data1.getAbsolutePath(), "/root/dhfs_default/data"); .withFileSystemBind(data1.getAbsolutePath(), "/root/dhfs_default/data");
if (testcontainersUser != null) {
container1.withCreateContainerCmdModifier(cmd -> cmd.withUser(testcontainersUser));
}
container2 = new GenericContainer<>(DhfsImage.getInstance()) container2 = new GenericContainer<>(DhfsImage.getInstance())
.withPrivilegedMode(true) .withPrivilegedMode(true)
.withCreateContainerCmdModifier(cmd -> Objects.requireNonNull(cmd.getHostConfig()).withDevices(Device.parse("/dev/fuse"))) .withCreateContainerCmdModifier(cmd -> Objects.requireNonNull(cmd.getHostConfig()).withDevices(Device.parse("/dev/fuse")))
.waitingFor(Wait.forLogMessage(".*Listening.*", 1).withStartupTimeout(Duration.ofSeconds(60))).withNetwork(network) .waitingFor(Wait.forLogMessage(".*Listening.*", 1).withStartupTimeout(Duration.ofSeconds(60))).withNetwork(network)
.withFileSystemBind(data2.getAbsolutePath(), "/root/dhfs_default/data"); .withFileSystemBind(data2.getAbsolutePath(), "/root/dhfs_default/data");
if (testcontainersUser != null) {
container2.withCreateContainerCmdModifier(cmd -> cmd.withUser(testcontainersUser));
}
Stream.of(container1, container2).parallel().forEach(GenericContainer::start); Stream.of(container1, container2).parallel().forEach(GenericContainer::start);