Merge pull request #266 from microsoft/sumsharma/pr_agent_make

agent: fix make test
microsoft · Dec 12, 2024 · 3d6665c · 3d6665c
2 parents 24cb087 + e8c73d9
commit 3d6665c
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/agent/src/device.rs b/src/agent/src/device.rs
@@ -1486,9 +1486,8 @@ mod tests {
     #[tokio::test]
     async fn test_get_device_name() {
         let devname = "vda";
-        let root_bus = create_pci_root_bus_path();
-        let relpath = "/0000:00:0a.0/0000:03:0b.0";
-        let devpath = format!("{}{}/virtio4/block/{}", root_bus, relpath, devname);
+        let pci0 = pci::Address::new(0, 0, pci::SlotFn::new(10, 0).unwrap());
+        let devpath = format!("{}/virtio4/block/{}", pci0.get_sysfs_path(), devname);
 
         let mut uev = crate::uevent::Uevent::default();
         uev.action = crate::linux_abi::U_EVENT_ACTION_ADD.to_string();
@@ -1503,7 +1502,7 @@ mod tests {
         sb.uevent_map.insert(devpath.clone(), uev);
         drop(sb); // unlock
 
-        let name = example_get_device_name(&sandbox, relpath).await;
+        let name = example_get_device_name(&sandbox, &pci0.get_sysfs_path()).await;
         assert!(name.is_ok(), "{}", name.unwrap_err());
         assert_eq!(name.unwrap(), devname);
 
@@ -1513,29 +1512,28 @@ mod tests {
 
         spawn_test_watcher(sandbox.clone(), uev);
 
-        let name = example_get_device_name(&sandbox, relpath).await;
+        let name = example_get_device_name(&sandbox, &pci0.get_sysfs_path()).await;
         assert!(name.is_ok(), "{}", name.unwrap_err());
         assert_eq!(name.unwrap(), devname);
     }
 
     #[tokio::test]
     #[allow(clippy::redundant_clone)]
     async fn test_virtio_blk_matcher() {
-        let root_bus = create_pci_root_bus_path();
         let devname = "vda";
 
         let mut uev_a = crate::uevent::Uevent::default();
-        let relpath_a = "/0000:00:0a.0";
+        let pci_a = pci::Address::new(0, 0, pci::SlotFn::new(10, 0).unwrap());
         uev_a.action = crate::linux_abi::U_EVENT_ACTION_ADD.to_string();
         uev_a.subsystem = BLOCK.to_string();
         uev_a.devname = devname.to_string();
-        uev_a.devpath = format!("{}{}/virtio4/block/{}", root_bus, relpath_a, devname);
-        let matcher_a = VirtioBlkPciMatcher::new(relpath_a);
+        uev_a.devpath = format!("{}/virtio4/block/{}", &pci_a.get_sysfs_path(), devname);
+        let matcher_a = VirtioBlkPciMatcher::new(&pci_a.get_sysfs_path());
 
         let mut uev_b = uev_a.clone();
-        let relpath_b = "/0000:00:0a.0/0000:00:0b.0";
-        uev_b.devpath = format!("{}{}/virtio0/block/{}", root_bus, relpath_b, devname);
-        let matcher_b = VirtioBlkPciMatcher::new(relpath_b);
+        let pci_b = pci::Address::new(0, 0, pci::SlotFn::new(11, 0).unwrap());
+        uev_b.devpath = format!("{}/virtio0/block/{}", &pci_b.get_sysfs_path(), devname);
+        let matcher_b = VirtioBlkPciMatcher::new(&pci_b.get_sysfs_path());
 
         assert!(matcher_a.is_match(&uev_a));
         assert!(matcher_b.is_match(&uev_b));