From 5490b721d8e37e3a0872e395a126b6c76f36a40d Mon Sep 17 00:00:00 2001
From: ChrisERo <cer95@cornell.edu>
Date: Fri, 14 Jan 2022 13:53:09 -0500
Subject: [PATCH] fix: made tests more efficient by waiting less

---
 test_e2e.sh | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/test_e2e.sh b/test_e2e.sh
index 302dfab..40bb137 100755
--- a/test_e2e.sh
+++ b/test_e2e.sh
@@ -1092,11 +1092,9 @@ function e2e::exechook_success_once() {
         --root="$ROOT" \
         --link="link" \
         --exechook-command="$EXECHOOK_COMMAND_SLEEPY" \
-        >> "$1" 2>&1 &
+        >> "$1" 2>&1
 
-    # Original test sleeps for 2 seconds, so sleep for 2 seconds more than
-    # hook's sleep time
-    sleep 5
+    sleep 2
     assert_link_exists "$ROOT"/link
     assert_file_exists "$ROOT"/link/file
     assert_file_exists "$ROOT"/link/exechook
@@ -1124,15 +1122,13 @@ function e2e::exechook_fail_once() {
             --link="link" \
             --exechook-command="$EXECHOOK_COMMAND_FAIL_SLEEPY" \
             --exechook-backoff=1s \
-            >> "$1" 2>&1 &
+            >> "$1" 2>&1
 
         # Check that exechook was called
-        # Original test sleeps for 2 seconds, so sleep for 2 seconds more than
-        # hook's sleep time
-        sleep 5
+        sleep 2
         RUNS=$(cat "$RUNLOG" | wc -l)
         if [[ "$RUNS" < 1 ]]; then
-            fail "exechook called $RUNS times, it should be at least 2"
+            fail "exechook called $RUNS times, it should be at least 1"
         fi
 }
 
@@ -1257,10 +1253,10 @@ function e2e::webhook_success_once() {
         --webhook-url="http://$IP" \
         --webhook-success-status=200 \
         --link="link" \
-        >> "$1" 2>&1 &
+        >> "$1" 2>&1
 
     # check that basic call works
-    sleep 5  # preserve original diff between hook sleep and test sleep time
+    sleep 2
     HITS=$(cat "$HITLOG" | wc -l)
     if [[ "$HITS" < 1 ]]; then
         fail "webhook 1 called $HITS times"
@@ -1294,10 +1290,10 @@ function e2e::webhook_fail_retry_once() {
         --webhook-url="http://$IP" \
         --webhook-success-status=200 \
         --link="link" \
-        >> "$1" 2>&1 &
+        >> "$1" 2>&1
 
     # Check that webhook was called
-    sleep 5 # preserve original diff between hook sleep and test sleep time
+    sleep 2
     HITS=$(cat "$HITLOG" | wc -l)
     if [[ "$HITS" < 1 ]]; then
         fail "webhook 1 called $HITS times"