From ae8bd1a9c99c27e5fb4d1707d4b55ca9d7c3be04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20M=C3=ADchal?= Date: Tue, 9 Nov 2021 11:34:10 +0200 Subject: [PATCH] test/system: Properly bail-out if failed to cache images The 'die' function is a remnant from times before the system tests rewrite. It served for writing an error message and then failing the test. Since the rewrite it is no longer present. Instead, simply use 'false' in case a caching step fails. Fallout from da6b6a7c5a6e5e284e6642c29159a872ceec94e2 https://github.com/containers/toolbox/pull/899 --- test/system/000-setup.bats | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/system/000-setup.bats b/test/system/000-setup.bats index 8259c32..de93031 100644 --- a/test/system/000-setup.bats +++ b/test/system/000-setup.bats @@ -5,8 +5,8 @@ load 'libs/helpers' @test "test suite: Setup" { _setup_environment # Cache the default image for the system - _pull_and_cache_distro_image $(get_system_id) $(get_system_version) || die + _pull_and_cache_distro_image $(get_system_id) $(get_system_version) || false # Cache all images that will be needed during the tests - _pull_and_cache_distro_image fedora 32 || die - _pull_and_cache_distro_image busybox || die + _pull_and_cache_distro_image fedora 32 || false + _pull_and_cache_distro_image busybox || false }