Rearrange test script

ci/test_mapserver_image.sh

@@ -54,6 +54,56 @@ graceful_exit() {
     teardown_test
 }
 
+start_test_container() {
+    debug "Starting test docker container (${image_url}:${image_tag})..."
+    docker run --rm -d --network ${NETWORK_NAME} --name test -p 8888:80 $@ ${image_url}:${image_tag}
+    start_status=$?
+    # just wait a bit to let the server start
+    sleep 2
+    debug "Container started."
+    return $start_status
+}
+
+start_shapefile_test_container() {
+    start_test_container -v "$(pwd)":"/data"
+}
+
+start_pg_test_container() {
+    mkdir pg_secrets
+    echo "${POSTGRES_PASSWORD}" > pg_secrets/fake_file
+    start_test_container -v "$(pwd)":"/data" -e POSTGRES_HOST=${PG_SERVER_NAME} -e POSTGRES_PORT=${PG_PORT} -e POSTGRES_PASSWORD_FILE="/data/pg_secrets/fake_file"
+}
+
+# start_minio() {
+#     base_dir=$1
+#     docker run -d --rm --name ${MINIO_SERVER_NAME} --user ${UID}:${UID} -p ${S3_PORT}:9000 -p 9001:9001 -v ${base_dir}:/data minio/minio server /data --console-address ":9001"
+# }
+
+start_postgres() {
+    debug "Starting Postgres database..."
+    docker run --rm -d --network ${NETWORK_NAME} --name ${PG_SERVER_NAME} -e POSTGRES_PASSWORD="${POSTGRES_PASSWORD}" postgis/postgis
+    debug "Sleeping for 5 seconds for DB to start up..."
+    sleep 5
+}
+
+kill_test_container() {
+    debug "Killing docker container..."
+    debug "-----------------------------------------"
+    docker logs test
+    debug "-----------------------------------------"
+    docker kill test >/dev/null
+    debug "Done killing docker container."
+}
+
+kill_postgres() {
+    debug "Killing postgres container..."
+    debug "-----------------------------------------"
+    docker logs ${PG_SERVER_NAME}
+    debug "-----------------------------------------"
+    docker kill ${PG_SERVER_NAME} >/dev/null
+    debug "Done killing postgres container."
+}
+
 add_shapefile_content() {
     debug "Creating fake shapefile directory for C01"
     gtiff_location=$1
@@ -142,57 +192,6 @@ EOF
     echo ${gtiff_fn}
     return $creation_status
 }
-
-start_test_container() {
-    debug "Starting test docker container (${image_url}:${image_tag})..."
-    docker run --rm -d --network ${NETWORK_NAME} --name test -p 8888:80 $@ ${image_url}:${image_tag}
-    start_status=$?
-    # just wait a bit to let the server start
-    sleep 2
-    debug "Container started."
-    return $start_status
-}
-
-start_shapefile_test_container() {
-    start_test_container -v "$(pwd)":"/data"
-}
-
-start_pg_test_container() {
-    mkdir pg_secrets
-    echo "${POSTGRES_PASSWORD}" > pg_secrets/fake_file
-    start_test_container -v "$(pwd)":"/data" -e POSTGRES_HOST=${PG_SERVER_NAME} -e POSTGRES_PORT=${PG_PORT} -e POSTGRES_PASSWORD_FILE="/data/pg_secrets/fake_file"
-}
-
-# start_minio() {
-#     base_dir=$1
-#     docker run -d --rm --name ${MINIO_SERVER_NAME} --user ${UID}:${UID} -p ${S3_PORT}:9000 -p 9001:9001 -v ${base_dir}:/data minio/minio server /data --console-address ":9001"
-# }
-
-start_postgres() {
-    debug "Starting Postgres database..."
-    docker run --rm -d --network ${NETWORK_NAME} --name ${PG_SERVER_NAME} -e POSTGRES_PASSWORD="${POSTGRES_PASSWORD}" postgis/postgis
-    debug "Sleeping for 5 seconds for DB to start up..."
-    sleep 5
-}
-
-kill_test_container() {
-    debug "Killing docker container..."
-    debug "-----------------------------------------"
-    docker logs test
-    debug "-----------------------------------------"
-    docker kill test >/dev/null
-    debug "Done killing docker container."
-}
-
-kill_postgres() {
-    debug "Killing postgres container..."
-    debug "-----------------------------------------"
-    docker logs ${PG_SERVER_NAME}
-    debug "-----------------------------------------"
-    docker kill ${PG_SERVER_NAME} >/dev/null
-    debug "Done killing postgres container."
-}
-
 curl_index() {
     debug "Starting curl basic request..."
     curl --fail -sS --max-time 5 "http://localhost:8888/" >/dev/null