test/vhost: fix vhost_blk RPC tests

Commit c63d9de433 replaced
remove_vhost_blk_controller with remove_vhost_controller, but test
wasn't updated to match.  The test had already been broken before that
point, because the RPC method name was incorrectly spelled using "block"
instead of "blk".  This hadn't been caught because this particular test
is expecting a failure, just not the particular failure that is being
caused by the incorrect method name.

Additionally, the "create block controller with incorrect name" test was
actually using the construct_vhost_scsi_controller RPC rather than
construct_vhost_blk_controller, so fix it while we're here.

Change-Id: Ib60f51639e0a3f65b09e2663186aa259be407ee4
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/388060
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: Paweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Daniel Verkamp 2017-11-17 16:45:22 -07:00 committed by Jim Harris
parent 8d62bec415
commit b81550158d

View File

@ -228,13 +228,13 @@ for vm_conf in ${vms[@]}; do
fi fi
echo "INFO: Trying to remove nonexistent block controller" echo "INFO: Trying to remove nonexistent block controller"
if $rpc_py remove_vhost_block_dev vhost.nonexistent.name 0; then if $rpc_py remove_vhost_controller vhost.nonexistent.name; then
echo "ERROR: Removing nonexistent block controller succeeded, but it shouldn't" echo "ERROR: Removing nonexistent block controller succeeded, but it shouldn't"
false false
fi fi
echo "INFO: Trying to create block controller with incorrect name" echo "INFO: Trying to create block controller with incorrect name"
if $rpc_py construct_vhost_scsi_controller . Malloc0; then if $rpc_py construct_vhost_blk_controller . Malloc0; then
echo "ERROR: Creating block controller with incorrect name succeeded, but it shouldn't" echo "ERROR: Creating block controller with incorrect name succeeded, but it shouldn't"
false false
fi fi