Notice to GitKraken users: A vulnerability has been found in the SSH key generation of GitKraken versions 7.6.0 to 8.0.0 (https://www.gitkraken.com/blog/weak-ssh-key-fix). If you use GitKraken and have generated a SSH key using one of these versions, please remove it both from your local workstation and from your LRZ GitLab profile.

21.10.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 3c00536d authored by Daniel Lehmberg's avatar Daniel Lehmberg
Browse files

minor adaption

parent d97dc235
Pipeline #131718 failed with stages
in 70 minutes and 24 seconds
...@@ -225,16 +225,17 @@ if __name__ == "__main__": ...@@ -225,16 +225,17 @@ if __name__ == "__main__":
passed_and_failed_scenarios_optimization = list() passed_and_failed_scenarios_optimization = list()
# Make a summery of all scenario files # Make a summery of all scenario files
passed_and_failed_scenarios = passed_and_failed_scenarios_model all_passed_and_failed_scenarios = passed_and_failed_scenarios_model
passed_and_failed_scenarios["failed"] += passed_and_failed_scenarios_optimization["failed"] all_passed_and_failed_scenarios["failed"].extend(passed_and_failed_scenarios_optimization["failed"])
passed_and_failed_scenarios["passed"] += passed_and_failed_scenarios_optimization["passed"] all_passed_and_failed_scenarios["passed"].extend(passed_and_failed_scenarios_optimization["passed"])
all_passed_and_failed_scenarios["failed_summary"].extend(passed_and_failed_scenarios_optimization["failed_summary"])
else: else:
passed_and_failed_scenarios = run_scenario_files_with_vadere_console([args.scenario]) all_passed_and_failed_scenarios = run_scenario_files_with_vadere_console([args.scenario])
print_summary(passed_and_failed_scenarios) print_summary(all_passed_and_failed_scenarios)
if has_failed_scenarios(passed_and_failed_scenarios): if has_failed_scenarios(all_passed_and_failed_scenarios):
exit(1) exit(1)
else: else:
exit(0) exit(0)
...@@ -10,13 +10,11 @@ import org.apache.commons.configuration2.ex.ConfigurationException; ...@@ -10,13 +10,11 @@ import org.apache.commons.configuration2.ex.ConfigurationException;
import org.vadere.util.logging.Logger; import org.vadere.util.logging.Logger;
import java.io.IOException; import java.io.IOException;
import java.nio.file.FileAlreadyExistsException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.HashMap; import java.util.HashMap;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.TreeMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -42,6 +40,7 @@ public class VadereConfig { ...@@ -42,6 +40,7 @@ public class VadereConfig {
// Static Variables // Static Variables
private static final Logger LOGGER = Logger.getLogger(VadereConfig.class); private static final Logger LOGGER = Logger.getLogger(VadereConfig.class);
// If changing any of the following values, remember to also change it in the CI configuration
private static final String CONFIG_FILENAME = "vadere.conf"; private static final String CONFIG_FILENAME = "vadere.conf";
private static final String HOME_DIR = System.getProperty("user.home"); private static final String HOME_DIR = System.getProperty("user.home");
private static final String CONFIG_DIR = ".config"; private static final String CONFIG_DIR = ".config";
...@@ -103,7 +102,7 @@ public class VadereConfig { ...@@ -103,7 +102,7 @@ public class VadereConfig {
} }
} }
// Static Getters // Static getters
/** /**
* Use Apache Common Configuration API on the returned object to retrieve Vadere's config options. * Use Apache Common Configuration API on the returned object to retrieve Vadere's config options.
* *
...@@ -118,6 +117,8 @@ public class VadereConfig { ...@@ -118,6 +117,8 @@ public class VadereConfig {
// Methods // Methods
private static Map<String, String> getDefaultConfig(){ private static Map<String, String> getDefaultConfig(){
//NOTE: Remember to also add the new configuration in existing vadere.conf file.
final Map<String, String> defaultConfig = new HashMap<>(); final Map<String, String> defaultConfig = new HashMap<>();
String defaultSearchDirectory = System.getProperty("user.home"); String defaultSearchDirectory = System.getProperty("user.home");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment