test_config_loading_from_multiple_sources fixed

Author: bakhterets

src/config.rs

@@ -184,6 +184,10 @@ mod test {
     use std::io::Write;
     use tempfile::Builder;
 
+    use std::sync::Mutex;
+
+    static ENV_LOCK: Mutex<()> = Mutex::new(());
+
     const CONFIG_STR1: &str = "
     datasource:
       url: 'https:/a.b'
@@ -275,6 +279,7 @@ mod test {
     /// Test merging config with env vars
     #[test]
     fn test_merge_env() {
+        let _lock = ENV_LOCK.lock().unwrap();
         // Create a file inside of `std::env::temp_dir()`.
         let mut config_file = Builder::new().suffix(".yaml").tempfile().unwrap();
 
@@ -283,7 +288,7 @@ mod test {
         env::set_var("MP_STATUS_DASHBOARD__SECRET", "val");
         let _config = config::Config::new(config_file.path().to_str().unwrap()).unwrap();
         assert_eq!(_config.status_dashboard.unwrap().secret.unwrap(), "val");
-        
+
         // Clean up to avoid affecting other tests
         env::remove_var("MP_STATUS_DASHBOARD__SECRET");
     }
@@ -359,13 +364,13 @@ mod test {
         health_metrics: {}
         ";
         let config = config::Config::from_config_str(minimal_config);
-        
+
         // Verify default server address
         assert_eq!("0.0.0.0", config.server.address);
-        
+
         // Verify default server port
         assert_eq!(3000, config.server.port);
-        
+
         // Verify default datasource timeout
         assert_eq!(10, config.datasource.timeout);
     }
@@ -385,7 +390,7 @@ mod test {
         health_metrics: {}
         ";
         let config = config::Config::from_config_str(config_str);
-        
+
         let socket_addr = config.get_socket_addr();
         assert_eq!("127.0.0.1:8080", socket_addr.to_string());
     }
@@ -395,15 +400,16 @@ mod test {
     /// but we add an explicit comprehensive test
     #[test]
     fn test_config_loading_from_multiple_sources() {
+        let _lock = ENV_LOCK.lock().unwrap();
         // Create temporary directory structure
         let dir = Builder::new().tempdir().unwrap();
         let main_config_path = dir.path().join("config.yaml");
         let mut main_config = File::create(&main_config_path).unwrap();
-        
+
         // Create conf.d directory
         let confd_path = dir.path().join("conf.d");
         create_dir(&confd_path).expect("Cannot create conf.d");
-        
+
         // Write main config with all required fields
         let main_config_content = "
         datasource:
@@ -421,7 +427,10 @@ mod test {
           - name: prod
         health_metrics: {}
         ";
-        main_config.write_all(main_config_content.as_bytes()).unwrap();
+        main_config
+            .write_all(main_config_content.as_bytes())
+            .unwrap();
+        main_config.sync_all().unwrap();
         // Ensure file is flushed and closed before reading
         drop(main_config);
 
@@ -436,33 +445,36 @@ mod test {
               - name: prod
         ";
         let mut flags_config = File::create(confd_path.join("flags.yaml")).unwrap();
-        flags_config.write_all(flags_config_content.as_bytes()).unwrap();
+        flags_config
+            .write_all(flags_config_content.as_bytes())
+            .unwrap();
+        flags_config.sync_all().unwrap();
         // Ensure file is flushed and closed before reading
         drop(flags_config);
 
         // Set environment variables to ensure required fields are present
         // This makes the test independent of any pre-existing env vars
         env::set_var("MP_DATASOURCE__URL", "https://graphite.example.com");
         env::set_var("MP_SERVER__PORT", "8080");
-        
+
         // Load config from all sources
         let config = config::Config::new(main_config_path.to_str().unwrap()).unwrap();
-        
+
         // Verify datasource config (env var ensures this is set)
         assert_eq!("https://graphite.example.com", config.datasource.url);
         assert_eq!(10, config.datasource.timeout);
-        
+
         // Verify conf.d part merged
         assert_eq!(1, config.flag_metrics.len());
         assert_eq!("test-metric", config.flag_metrics[0].name);
-        
+
         // Verify environment variable merged (overrides main config)
         assert_eq!(8080, config.server.port);
-        
+
         // Clean up environment variables
         env::remove_var("MP_DATASOURCE__URL");
         env::remove_var("MP_SERVER__PORT");
-        
+
         // Cleanup
         dir.close().unwrap();
     }