fix settings directory

Author: michaelmattig

services/src/util/config.rs

@@ -53,8 +53,7 @@ fn init_settings() -> RwLock<Config> {
 }
 
 /// test may run in subdirectory
-#[cfg(test)]
-fn retrieve_settings_dir() -> Result<PathBuf> {
+pub fn retrieve_settings_dir() -> Result<PathBuf> {
     use crate::error::Error;
 
     const MAX_PARENT_DIRS: usize = 1;
@@ -75,11 +74,6 @@ fn retrieve_settings_dir() -> Result<PathBuf> {
     Err(Error::MissingSettingsDirectory)
 }
 
-#[cfg(not(test))]
-fn retrieve_settings_dir() -> Result<PathBuf> {
-    std::env::current_dir().context(error::MissingWorkingDirectory)
-}
-
 #[cfg(test)]
 pub fn set_config<T>(key: &str, value: T) -> Result<()>
 where

services/tests/startup.rs

@@ -18,9 +18,14 @@ impl Drop for DroppingServer {
 
 impl DroppingServer {
     fn new(schema_name: &str) -> Self {
+        let dir = geoengine_services::util::config::retrieve_settings_dir().unwrap();
+
         let process = Command::cargo_bin("main")
             .unwrap()
-            .env("GEOENGINE_SETTINGS_FILE_PATH", "Settings-test.toml")
+            .env(
+                "GEOENGINE_SETTINGS_FILE_PATH",
+                dir.join("Settings-test.toml"),
+            )
             .env("GEOENGINE_POSTGRES__SCHEMA", schema_name)
             .stderr(Stdio::piped())
             .spawn()