Commit b8155015 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

test/vhost: fix vhost_blk RPC tests



Commit c63d9de4 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: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/388060


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarPaweł Niedźwiecki <pawelx.niedzwiecki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 8d62bec4
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -228,13 +228,13 @@ for vm_conf in ${vms[@]}; do
			fi

			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"
				false
			fi

			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"
				false
			fi