From 2487af18b9715c810c3203e2d7fa32bb6b0f6673 Mon Sep 17 00:00:00 2001
From: David Hoese <david.hoese@ssec.wisc.edu>
Date: Fri, 22 Apr 2022 14:32:54 -0500
Subject: [PATCH] More CI script refactoring
---
ci/test_mapserver_image.sh | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/ci/test_mapserver_image.sh b/ci/test_mapserver_image.sh
index 5ddb3f9..82ababc 100755
--- a/ci/test_mapserver_image.sh
+++ b/ci/test_mapserver_image.sh
@@ -35,7 +35,7 @@ start_test_container() {
}
kill_test_container() {
- debug "Curl complete. Killing docker container..."
+ debug "Killing docker container..."
docker kill test >/dev/null
debug "Done killing docker container."
}
@@ -45,11 +45,18 @@ curl_index() {
curl --fail -sS --max-time 5 "http://localhost:8888/" >/dev/null
}
+curl_empty_tile() {
+ debug "Starting curl basic mapfile request..."
+ # NOTE: The time doesn't actually exist and no image data is available. A blank image should be returned
+ curl --fail -sS "http://localhost:8888/wms/g16/abi/radf/l1b?VERSION=1.1.1&REQUEST=GetMap&SERVICE=WMS&STYLES=&BBOX=-1330667.479176%2c-2773559.926648%2c2773559.926648%2c1330667.479176&WIDTH=256&HEIGHT=256&FORMAT=rgba&SRS=EPSG%3a930916&LAYERS=C01&TIME=2022-04-20T16:00:21Z" >/dev/null || pg_exit_status=1
+}
+
run_basic_shapefile_tests() {
sf_exit_status=0
debug "Starting shapefile tests..."
start_test_container || sf_exit_status=1
curl_index || sf_exit_status=1
+ curl_empty_tile || sf_exit_status=1
kill_test_container
return $sf_exit_status
@@ -61,10 +68,7 @@ run_basic_postgres_tests() {
start_test_container -e POSTGRES_HOST=localhost -e POSTGRES_PASSWORD_FILE="/secrets/fake_file" || pg_exit_status=1
add_shapefile_content
curl_index || pg_exit_status=1
-
- debug "Starting curl basic mapfile request..."
- # NOTE: The time doesn't actually exist and no image data is available. A blank image should be returned
- curl --fail -sS --max-time 5 "http://localhost:8888/wms/g16/abi/radf/l1b?VERSION=1.1.1&REQUEST=GetMap&SERVICE=WMS&STYLES=&BBOX=-1330667.479176%2c-2773559.926648%2c2773559.926648%2c1330667.479176&WIDTH=256&HEIGHT=256&FORMAT=rgba&SRS=EPSG%3a930916&LAYERS=C01&TIME=2022-04-20T16:00:21Z" >/dev/null || pg_exit_status=1
+ curl_empty_tile || pg_exit_status=1
kill_test_container
return $pg_exit_status
@@ -72,7 +76,10 @@ run_basic_postgres_tests() {
exit_status=0
run_basic_shapefile_tests || exit_status=1
+echo "#######"
run_basic_postgres_tests || exit_status=1
+echo "#######"
+
if [[ $exit_status -eq 0 ]]; then
debug "SUCCESS"
else
--
GitLab