tests: Rename distro test functions

Give the distro test function names a better prefix.

Signed-off-by: James O. D. Hunt <james.o.hunt@intel.com>
This commit is contained in:
James O. D. Hunt 2018-07-25 09:45:22 +01:00
parent db567a00f3
commit f077e6efdc

View File

@ -313,26 +313,26 @@ run_test()
create_and_run "${distro}" "${image_options}" "${initrd_options}" create_and_run "${distro}" "${image_options}" "${initrd_options}"
} }
test_fedora() test_distro_fedora()
{ {
local -r name="Can create and run fedora image" local -r name="Can create and run fedora image"
run_test "${name}" "" "fedora" "service" "no" run_test "${name}" "" "fedora" "service" "no"
} }
test_clearlinux() test_distro_clearlinux()
{ {
local -r name="Can create and run clearlinux image" local -r name="Can create and run clearlinux image"
run_test "${name}" "" "clearlinux" "service" "no" run_test "${name}" "" "clearlinux" "service" "no"
} }
test_centos() test_distro_centos()
{ {
local -r name="Can create and run centos image" local -r name="Can create and run centos image"
run_test "${name}" "" "centos" "service" "no" run_test "${name}" "" "centos" "service" "no"
} }
test_euleros() test_distro_euleros()
{ {
local -r name="Can create and run euleros image" local -r name="Can create and run euleros image"
@ -341,7 +341,7 @@ test_euleros()
run_test "${name}" "$skip" "euleros" "service" "no" run_test "${name}" "$skip" "euleros" "service" "no"
} }
test_alpine() test_distro_alpine()
{ {
local -r name="Can create and run alpine image" local -r name="Can create and run alpine image"
run_test "${name}" "" "alpine" "no" "init" run_test "${name}" "" "alpine" "no" "init"
@ -350,15 +350,17 @@ test_alpine()
main() main()
{ {
setup setup
test_fedora
test_centos test_distro_fedora
test_alpine test_distro_centos
test_distro_alpine
if [ $MACHINE_TYPE != "ppc64le" ]; then if [ $MACHINE_TYPE != "ppc64le" ]; then
test_clearlinux test_distro_clearlinux
# Run last as EulerOS servers can be slow and we don't want to fail the # Run last as EulerOS servers can be slow and we don't want to fail the
# previous tests. # previous tests.
test_euleros test_distro_euleros
fi fi
} }