github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 20:24:31 +00:00
Code Issues Projects Releases Wiki Activity

agent/device: Update test_get_device_name()

Browse Source 
The current test_get_device_name(), ported from Kata 1.x doesn't really
reflect how the function is used in practice.  The example path appears
to be for a virtio-blk device, but it's an s390 specific variant, not a
PCI device.  The s390 form isn't actually supported by any of the existing
users of get_device_name().

Change it to a plausible virtio-blk-pci style path to better test how
get_device_name() will actually be used in practice.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
David Gibson 2021-04-06 20:49:48 +10:00
parent e3e670c56f
commit 4f60880414
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/agent/src/device.rs
View File

@ -780,8 +780,9 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test_get_device_name() { async fn test_get_device_name() {
let devname = "vda"; let devname = "vda";
let busid = "0.0.0005"; let root_bus = create_pci_root_bus_path();
let devpath = format!("/dev/ces/css0/0.0.0004/{}/virtio4/block/{}", busid, devname); let relpath = "/0000:00:0a.0/0000:03:0b.0";
let devpath = format!("{}{}/virtio4/block/{}", root_bus, relpath, devname);
let logger = slog::Logger::root(slog::Discard, o!()); let logger = slog::Logger::root(slog::Discard, o!());
let sandbox = Arc::new(Mutex::new(Sandbox::new(&logger).unwrap())); let sandbox = Arc::new(Mutex::new(Sandbox::new(&logger).unwrap()));
@ -791,7 +792,7 @@ mod tests {
.insert(devpath.clone(), devname.to_string()); .insert(devpath.clone(), devname.to_string());
drop(sb); // unlock drop(sb); // unlock
let name = get_device_name(&sandbox, busid).await; let name = get_device_name(&sandbox, relpath).await;
assert!(name.is_ok(), "{}", name.unwrap_err()); assert!(name.is_ok(), "{}", name.unwrap_err());
assert_eq!(name.unwrap(), format!("{}/{}", SYSTEM_DEV_PATH, devname)); assert_eq!(name.unwrap(), format!("{}/{}", SYSTEM_DEV_PATH, devname));
@ -817,7 +818,7 @@ mod tests {
} }
}); });
let name = get_device_name(&sandbox, busid).await; let name = get_device_name(&sandbox, relpath).await;
assert!(name.is_ok(), "{}", name.unwrap_err()); assert!(name.is_ok(), "{}", name.unwrap_err());
assert_eq!(name.unwrap(), format!("{}/{}", SYSTEM_DEV_PATH, devname)); assert_eq!(name.unwrap(), format!("{}/{}", SYSTEM_DEV_PATH, devname));
} }