From 1427907a82a08d12fb0a03f199b714cce7c210f5 Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Mon, 22 Nov 2021 13:22:09 +0530
Subject: [PATCH] ci: revert shell script functions

---
 tests/functions.sh        | 50 ---------------------------------------
 tests/integration-test.sh | 50 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/tests/functions.sh b/tests/functions.sh
index 55880e12..8453c499 100644
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -24,53 +24,3 @@ ping_site() {
         exit 1
     fi
 }
-
-check_migration_complete() {
-    print_group Check migration
-
-    container_id=$(docker_compose_with_args ps -q frappe-python)
-    cmd="docker logs ${container_id} 2>&1 | grep 'Starting gunicorn' || echo ''"
-    worker_log=$(eval "$cmd")
-    INCREMENT=0
-
-    while [[ ${worker_log} != *"Starting gunicorn"* && ${INCREMENT} -lt 120 ]]; do
-        sleep 3
-        ((INCREMENT = INCREMENT + 1))
-        echo "Wait for migration to complete..."
-        worker_log=$(eval "$cmd")
-        if [[ ${worker_log} != *"Starting gunicorn"* && ${INCREMENT} -eq 120 ]]; then
-            echo Migration timeout
-            docker logs "${container_id}"
-            exit 1
-        fi
-    done
-
-    echo Migration Log
-    docker logs "${container_id}"
-}
-
-check_health() {
-    print_group Loop health check
-
-    docker run --name frappe_doctor \
-        -v "${project_name}_sites-vol:/home/frappe/frappe-bench/sites" \
-        --network "${project_name}_default" \
-        frappe/frappe-worker:edge doctor || true
-
-    cmd='docker logs frappe_doctor | grep "Health check successful" || echo ""'
-    doctor_log=$(eval "$cmd")
-    INCREMENT=0
-
-    while [[ -z "${doctor_log}" && ${INCREMENT} -lt 60 ]]; do
-        sleep 1
-        ((INCREMENT = INCREMENT + 1))
-        container=$(docker start frappe_doctor)
-        echo "Restarting ${container}..."
-        doctor_log=$(eval "$cmd")
-
-        if [[ ${INCREMENT} -eq 60 ]]; then
-            docker logs "${container}"
-            exit 1
-        fi
-    done
-}
diff --git a/tests/integration-test.sh b/tests/integration-test.sh
index 35eabe26..af7a8831 100755
--- a/tests/integration-test.sh
+++ b/tests/integration-test.sh
@@ -16,6 +16,56 @@ docker_compose_with_args() {
         $@
 }
 
+check_migration_complete() {
+    print_group Check migration
+
+    container_id=$(docker_compose_with_args ps -q frappe-python)
+    cmd="docker logs ${container_id} 2>&1 | grep 'Starting gunicorn' || echo ''"
+    worker_log=$(eval "$cmd")
+    INCREMENT=0
+
+    while [[ ${worker_log} != *"Starting gunicorn"* && ${INCREMENT} -lt 120 ]]; do
+        sleep 3
+        ((INCREMENT = INCREMENT + 1))
+        echo "Wait for migration to complete..."
+        worker_log=$(eval "$cmd")
+        if [[ ${worker_log} != *"Starting gunicorn"* && ${INCREMENT} -eq 120 ]]; then
+            echo Migration timeout
+            docker logs "${container_id}"
+            exit 1
+        fi
+    done
+
+    echo Migration Log
+    docker logs "${container_id}"
+}
+
+check_health() {
+    print_group Loop health check
+
+    docker run --name frappe_doctor \
+        -v "${project_name}_sites-vol:/home/frappe/frappe-bench/sites" \
+        --network "${project_name}_default" \
+        frappe/frappe-worker:edge doctor || true
+
+    cmd='docker logs frappe_doctor | grep "Health check successful" || echo ""'
+    doctor_log=$(eval "$cmd")
+    INCREMENT=0
+
+    while [[ -z "${doctor_log}" && ${INCREMENT} -lt 60 ]]; do
+        sleep 1
+        ((INCREMENT = INCREMENT + 1))
+        container=$(docker start frappe_doctor)
+        echo "Restarting ${container}..."
+        doctor_log=$(eval "$cmd")
+
+        if [[ ${INCREMENT} -eq 60 ]]; then
+            docker logs "${container}"
+            exit 1
+        fi
+    done
+}
+
 # Initial group
 echo ::group::Setup .env
 cp env-example .env