tests: Use "--disks" for vhost-user-block testing

Use newly unified command line options for testing vhost-user based
block support.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2020-01-28 11:50:51 +00:00
parent aeeae661fc
commit 12f4cd951a

View File

@ -2771,16 +2771,13 @@ mod tests {
guest.disk_config.disk(DiskType::CloudInit).unwrap()
)
.as_str(),
])
.args(&["--net", guest.default_net_string().as_str()])
.args(&[
"--vhost-user-blk",
format!(
"sock={},num_queues=1,queue_size=128,wce=true",
"vhost_user=true,socket={},num_queues=1,queue_size=128,wce=true",
vubd_socket_path
)
.as_str(),
])
.args(&["--net", guest.default_net_string().as_str()])
.spawn()
.unwrap();
@ -2855,16 +2852,13 @@ mod tests {
guest.disk_config.disk(DiskType::CloudInit).unwrap()
)
.as_str(),
])
.args(&["--net", guest.default_net_string().as_str()])
.args(&[
"--vhost-user-blk",
format!(
"sock={},num_queues=1,queue_size=128,wce=true",
"vhost_user=true,socket={},num_queues=1,queue_size=128,wce=true",
vubd_socket_path
)
.as_str(),
])
.args(&["--net", guest.default_net_string().as_str()])
.spawn()
.unwrap();
@ -2932,16 +2926,13 @@ mod tests {
guest.disk_config.disk(DiskType::CloudInit).unwrap()
)
.as_str(),
])
.args(&["--net", guest.default_net_string().as_str()])
.args(&[
"--vhost-user-blk",
format!(
"sock={},num_queues=1,queue_size=128,wce=true",
"vhost_user=true,socket={},num_queues=1,queue_size=128,wce=true",
vubd_socket_path
)
.as_str(),
])
.args(&["--net", guest.default_net_string().as_str()])
.spawn()
.unwrap();
@ -3000,16 +2991,13 @@ mod tests {
guest.disk_config.disk(DiskType::CloudInit).unwrap()
)
.as_str(),
])
.args(&["--net", guest.default_net_string().as_str()])
.args(&[
"--vhost-user-blk",
format!(
"sock={},num_queues=1,queue_size=128,wce=true",
"vhost_user=true,socket={},num_queues=1,queue_size=128,wce=true",
vubd_socket_path
)
.as_str(),
])
.args(&["--net", guest.default_net_string().as_str()])
.spawn()
.unwrap();