Fix testing

Author: gllb

src/config/watcher.rs

@@ -200,6 +200,19 @@ mod tests {
         )
     }
 
+    async fn test_component_reload(file: &mut File,
+                                   expected_component: &ComponentKey,
+                                   timeout: Duration,
+                                   mut receiver: SignalRx) -> bool {
+        file.write_all(&[0]).unwrap();
+        file.sync_all().unwrap();
+
+        matches!(
+            tokio::time::timeout(timeout, receiver.recv()).await,
+            Ok(Ok(crate::signal::SignalTo::ReloadComponents(components))) if components.contains(expected_component)
+        )
+    }
+
     #[tokio::test]
     async fn file_directory_update() {
         trace_init();
@@ -209,10 +222,15 @@ mod tests {
         let file_path = dir.join("vector.toml");
         let watcher_conf = WatcherConfig::RecommendedWatcher;
         let component_file_path = vec![dir.join("tls.cert"), dir.join("tls.key")];
+        let http_component = ComponentKey::from("http");
+
         let component_config =
-            ComponentConfig::new(component_file_path, ComponentKey::from("http"));
+            ComponentConfig::new(component_file_path.clone(), http_component.clone());
         std::fs::create_dir(&dir).unwrap();
         let mut file = File::create(&file_path).unwrap();
+        let mut component_files: Vec<std::fs::File> = component_file_path.iter().map(|file| {
+            File::create(&file).unwrap()
+        }).collect();
 
         let (signal_tx, signal_rx) = broadcast::channel(128);
         spawn_thread(
@@ -224,7 +242,18 @@ mod tests {
         )
         .unwrap();
 
-        if !test(&mut file, delay * 5, signal_rx).await {
+        let signal_rx2 = signal_rx.resubscribe();
+        let signal_rx3 = signal_rx.resubscribe();
+
+        if !test_component_reload(&mut component_files[0], &http_component, delay * 5, signal_rx).await {
+            panic!("Test timed out");
+        }
+
+        if !test_component_reload(&mut component_files[1], &http_component, delay * 5, signal_rx2).await {
+            panic!("Test timed out");
+        }
+
+        if !test(&mut file, delay * 5, signal_rx3).await {
             panic!("Test timed out");
         }
     }