github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 07:05:14 +00:00
Code Issues Projects Releases Wiki Activity

tests: Pass parameters to functions

Browse Source 
Try to minimise the use of globals by passing parameters to the
remaining functions.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2018-05-25 14:16:34 +01:00
parent c8e7f4253e
commit 3a8da5f108
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tests/image_creation.bats
View File

@ -24,24 +24,33 @@ teardown(){
build_rootfs()
{
local full="${tmp_rootfs}${osbuilder_file}"
local distro="$1"
local rootfs="$2"
local full="${rootfs}${osbuilder_file}"
# clean up from any previous runs
[ -d "${tmp_rootfs}" ] && sudo rm -rf "${tmp_rootfs}"
[ -d "${rootfs}" ] && sudo rm -rf "${rootfs}"
sudo -E ${rootfs_sh} -r "${tmp_rootfs}" "${distro}"
sudo -E ${rootfs_sh} -r "${rootfs}" "${distro}"
yamllint "${full}"
}
build_image()
{
sudo -E ${image_builder_sh} -o "${tmp_dir}/image.img" "${tmp_rootfs}"
local file="$1"
local rootfs="$2"
sudo -E ${image_builder_sh} -o "${file}" "${rootfs}"
}
build_initrd()
{
sudo -E ${initrd_builder_sh} -o "${tmp_dir}/initrd-image.img" "${tmp_rootfs}"
local file="$1"
local rootfs="$2"
sudo -E ${initrd_builder_sh} -o "${file}" "${rootfs}"
}
build_rootfs_image_initrd()
@ -51,10 +60,10 @@ build_rootfs_image_initrd()
initrd="$3"
[ -n "$distro" ]
build_rootfs $distro
build_rootfs "${distro}" "${tmp_rootfs}"
[ "$image" = "yes" ] && build_image
[ "$initrd" = "yes" ] && build_initrd
[ "$image" = "yes" ] && build_image "${tmp_dir}/image.img" "${tmp_rootfs}"
[ "$initrd" = "yes" ] && build_initrd "${tmp_dir}/initrd-image.img" "${tmp_rootfs}"
}
@test "Can create fedora image" {