wbrawner/toolbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/system: Use long options, instead of their shorter aliases

Browse source 
The long options are easier to grep(1) for in the sources than their
shorter aliases.

https://github.com/containers/toolbox/pull/1197
This commit is contained in:
Debarshi Ray 2022-12-12 14:54:17 +01:00
parent f17a632f9a
commit 5e8446971c
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/system/libs/helpers.bash
View file

@ -56,10 +56,10 @@ function _setup_containers_storage() {
function _clean_temporary_storage() {
$PODMAN system reset -f
rm -rf ${ROOTLESS_PODMAN_STORE_DIR}
rm -rf ${ROOTLESS_PODMAN_RUNROOT_DIR}
rm -rf ${PODMAN_STORE_CONFIG_FILE}
rm -rf ${TEMP_STORAGE_DIR}
rm --force --recursive ${ROOTLESS_PODMAN_STORE_DIR}
rm --force --recursive ${ROOTLESS_PODMAN_RUNROOT_DIR}
rm --force --recursive ${PODMAN_STORE_CONFIG_FILE}
rm --force --recursive ${TEMP_STORAGE_DIR}
}
@ -127,7 +127,7 @@ function _pull_and_cache_distro_image() {
# Removes the folder with cached images
function _clean_cached_images() {
rm -rf ${IMAGE_CACHE_DIR}
rm --force --recursive ${IMAGE_CACHE_DIR}
}
@ -218,9 +218,9 @@ function _clean_docker_registry() {
$PODMAN --root "${DOCKER_REG_ROOT}" rm --all --force
$PODMAN --root "${DOCKER_REG_ROOT}" rmi --all --force
# Remove Docker registry dir
rm -rf "${DOCKER_REG_ROOT}"
rm --force --recursive "${DOCKER_REG_ROOT}"
# Remove dir with created registry certificates
rm -rf "$HOME"/.config/containers/certs.d/"${DOCKER_REG_URI}"
rm --force --recursive "$HOME"/.config/containers/certs.d/"${DOCKER_REG_URI}"
}
@ -430,17 +430,17 @@ function stop_container() {
# Returns the name of the latest created container
function get_latest_container_name() {
$PODMAN ps -l --format "{{ .Names }}"
$PODMAN ps --latest --format "{{ .Names }}"
}
function list_images() {
$PODMAN images --all --quiet | wc -l
$PODMAN images --all --quiet | wc --lines
}
function list_containers() {
$PODMAN ps --all --quiet | wc -l
$PODMAN ps --all --quiet | wc --lines
}