From 085abd8eb7c744170cd92429b9aea9d07fd4458b Mon Sep 17 00:00:00 2001 From: Mate Lakat Date: Wed, 11 Dec 2013 12:21:12 +0000 Subject: [PATCH] Fix xenapi functions' tests The tests got outdated, this fix makes the tests pass again. Change-Id: Iadddfbf34bf79ba455811645e766c2f3d0fcca84 --- tools/xen/mocks | 2 +- tools/xen/test_functions.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/xen/mocks b/tools/xen/mocks index 94b0ca4d02..ec8679e816 100644 --- a/tools/xen/mocks +++ b/tools/xen/mocks @@ -73,7 +73,7 @@ function [ { done return 1 fi - echo "Mock test does not implement the requested function" + echo "Mock test does not implement the requested function: ${1:-}" exit 1 } diff --git a/tools/xen/test_functions.sh b/tools/xen/test_functions.sh index 0ae2cb7f9a..14551868e1 100755 --- a/tools/xen/test_functions.sh +++ b/tools/xen/test_functions.sh @@ -118,7 +118,7 @@ function test_zip_snapshot_location { function test_create_directory_for_kernels { ( . mocks - mock_out get_local_sr uuid1 + mock_out get_local_sr_path /var/run/sr-mount/uuid1 create_directory_for_kernels ) @@ -141,7 +141,7 @@ EOF function test_create_directory_for_images { ( . mocks - mock_out get_local_sr uuid1 + mock_out get_local_sr_path /var/run/sr-mount/uuid1 create_directory_for_images ) @@ -199,8 +199,7 @@ function test_get_local_sr { [ "$RESULT" == "uuid123" ] - assert_xe_min - assert_xe_param "sr-list" "name-label=Local storage" + assert_xe_param "pool-list" params=default-SR minimal=true } function test_get_local_sr_path {