Skip to content

Commit 75f56df

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Fix xenapi functions' tests"
2 parents 4cd482c + 085abd8 commit 75f56df

2 files changed

Lines changed: 4 additions & 5 deletions

File tree

‎tools/xen/mocks‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ function [ {
7373
done
7474
return 1
7575
fi
76-
echo "Mock test does not implement the requested function"
76+
echo "Mock test does not implement the requested function: ${1:-}"
7777
exit 1
7878
}
7979

‎tools/xen/test_functions.sh‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ function test_zip_snapshot_location {
118118
function test_create_directory_for_kernels {
119119
(
120120
. mocks
121-
mock_out get_local_sr uuid1
121+
mock_out get_local_sr_path /var/run/sr-mount/uuid1
122122
create_directory_for_kernels
123123
)
124124

@@ -141,7 +141,7 @@ EOF
141141
function test_create_directory_for_images {
142142
(
143143
. mocks
144-
mock_out get_local_sr uuid1
144+
mock_out get_local_sr_path /var/run/sr-mount/uuid1
145145
create_directory_for_images
146146
)
147147

@@ -199,8 +199,7 @@ function test_get_local_sr {
199199

200200
[ "$RESULT" == "uuid123" ]
201201

202-
assert_xe_min
203-
assert_xe_param "sr-list" "name-label=Local storage"
202+
assert_xe_param "pool-list" params=default-SR minimal=true
204203
}
205204

206205
function test_get_local_sr_path {

0 commit comments

Comments
 (0)