Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-03-17 09:40:25 +01:00
Code Issues Packages Projects Releases Activity

Re-add exit code restart strategy

Browse Source
This commit is contained in:
Eduard Heimbuch
2024-01-09 09:20:43 +01:00
parent 5cffa4f26d
commit b397aaacce
4 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/test/java/sonia/scm/lifecycle/DefaultRestarterTest.java
View File

@@ -48,12 +48,12 @@ class DefaultRestarterTest {
@Test
void shouldLoadStrategyOnCreation() {
System.setProperty(RestartStrategyFactory.PROPERTY_STRATEGY, ExitRestartStrategy.NAME);
System.setProperty(RestartStrategyFactory.RESTART_STRATEGY, ExitRestartStrategy.NAME);
try {
DefaultRestarter restarter = new DefaultRestarter();
assertThat(restarter.isSupported()).isTrue();
} finally {
System.clearProperty(RestartStrategyFactory.PROPERTY_STRATEGY);
System.clearProperty(RestartStrategyFactory.RESTART_STRATEGY);
}
}

15
scm-webapp/src/test/java/sonia/scm/lifecycle/RestartStrategyFactoryTest.java
View File

@@ -29,13 +29,14 @@ import org.junit.jupiter.api.io.TempDir;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import sonia.scm.Platform;
import sonia.scm.config.WebappConfigProvider;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -123,12 +124,12 @@ class RestartStrategyFactoryTest {
}
private static Builder builder() {
WebappConfigProvider.setConfigBindings(Collections.emptyMap());
return new Builder();
}
private static class Builder {
private final Properties properties = new Properties();
private final Map<String, String> environment = new HashMap<>();
private Platform platform = new Platform("Linux", "64Bit", "x64");
@@ -137,11 +138,11 @@ class RestartStrategyFactoryTest {
}
public Builder withStrategy(String strategy) {
return withProperty(RestartStrategyFactory.PROPERTY_STRATEGY, strategy);
return withConfig(strategy);
}
public Builder withProperty(String key, String value) {
properties.setProperty(key, value);
private Builder withConfig(String strategy) {
WebappConfigProvider.setConfigBindings(Map.of(RestartStrategyFactory.RESTART_STRATEGY, strategy));
return this;
}
@@ -156,9 +157,7 @@ class RestartStrategyFactoryTest {
}
public RestartStrategyFactory create() {
return new RestartStrategyFactory(platform, environment, properties);
return new RestartStrategyFactory(platform, environment);
}
}
}