fix: bats test refactoring (#1731)

Signed-off-by: Alexei Dodon <adodon@cisco.com>

test/blackbox/helpers_cloud.bash

@@ -12,12 +12,12 @@ function verify_prerequisites {
         return 1
     fi
 
-    if [ ! command -v skopeo &> /dev/null ]; then
+    if [ ! $(command -v skopeo) ]; then
         echo "you need to install skopeo as a prerequisite to running the tests" >&3
         return 1
     fi
 
-    if [ ! command -v awslocal ] &>/dev/null; then
+    if [ ! $(command -v awslocal) ] &>/dev/null; then
         echo "you need to install aws cli as a prerequisite to running the tests" >&3
         return 1
     fi
@@ -39,37 +39,9 @@ function zot_stop() {
     pkill zot
 }
 
-function wait_str() {
-    local filepath="$1"
-    local search_term="$2"
-    local wait_time="${3:-2m}"
-
-    (timeout $wait_time tail -F -n0 "$filepath" &) | grep -q "$search_term" && return 0
-
-    echo "timeout of $wait_time reached. unable to find '$search_term' in '$filepath'"
-    
-    return 1
-}
-
-function wait_for_string() {
-    local search_term="$1"
-    local filepath="$2"
-    local wait_time="${3:-2m}"
-
-    wait_file "$filepath" 60 || { echo "server log file missing: '$filepath'"; return 1; }
-
-    wait_str "$filepath" "$search_term" "$wait_time"
-}
-
-function wait_file() {
-    local file="$1"; shift
-    local wait_seconds="${1:-60}"; shift
-
-    until test $((wait_seconds--)) -eq 0 -o -f "$file" ; do sleep 1; done
-}
-
 function wait_zot_reachable() {
-    zot_url=${1}
+    local zot_port=${1}
+    local zot_url=http://127.0.0.1:${zot_port}/v2/_catalog
     curl --connect-timeout 3 \
         --max-time 10 \
         --retry 10 \