From b81550158de0263d2749f9b206cd57abab4aa0f7 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 17 Nov 2017 16:45:22 -0700 Subject: [PATCH] test/vhost: fix vhost_blk RPC tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit c63d9de433cb4b624521ae5f0ec699755c347761 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 Reviewed-on: https://review.gerrithub.io/388060 Tested-by: SPDK Automated Test System Reviewed-by: Dariusz Stojaczyk Reviewed-by: Paweł Niedźwiecki Reviewed-by: Jim Harris Reviewed-by: Ben Walker --- test/vhost/fiotest/autotest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/vhost/fiotest/autotest.sh b/test/vhost/fiotest/autotest.sh index f7dac7b50..f718fa02f 100755 --- a/test/vhost/fiotest/autotest.sh +++ b/test/vhost/fiotest/autotest.sh @@ -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