test(core): remove subscriber sleep

GaloyMoney · Dec 20, 2023 · 8c2fc05 · 8c2fc05
1 parent f471d3a
commit 8c2fc05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/bats/core/api/ln-receive.bats b/bats/core/api/ln-receive.bats
@@ -18,7 +18,7 @@ setup_file() {
   fund_user_onchain "$ALICE" 'btc_wallet'
 
   subscribe_to "$ALICE" my-updates-sub
-  sleep 3
+  retry 10 1 subscriber_is_up
 }
 
 teardown_file() {

diff --git a/bats/helpers/ln.bash b/bats/helpers/ln.bash
@@ -81,7 +81,8 @@ check_for_ln_update() {
   retry 10 1 \
     grep "Data.*LnUpdate.*$payment_hash" "$SUBSCRIBER_LOG_FILE" \
     | awk '{print $2}' \
-    | jq -r --arg hash "$payment_hash" 'select(.data.myUpdates.update.paymentHash == $hash)'
+    | jq -r --arg hash "$payment_hash" 'select(.data.myUpdates.update.paymentHash == $hash)' \
+  || exit 1
 
   paid_status=$( \
     grep 'Data.*LnUpdate' "$SUBSCRIBER_LOG_FILE" \

diff --git a/bats/helpers/subscriber.bash b/bats/helpers/subscriber.bash
@@ -29,3 +29,7 @@ stop_subscriber() {
   [[ -f "$SUBSCRIBER_PID_FILE" ]] && kill $(cat $SUBSCRIBER_PID_FILE) > /dev/null || true
 }
 
+subscriber_is_up() {
+  grep "Data:" "$SUBSCRIBER_LOG_FILE"
+  return "$?"
+}