VladPolskiy/openstreetmap-mod_tile-python-implementation
1
0
Fork 0
mirror of https://github.com/openstreetmap/mod_tile.git synced 2025-07-25 15:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed various CI failures (#328)

Browse Source 
* Fix `Unknown argument "--skip-broken" for command "dnf5"`

* Increase timeout for `render_list` & `render_old` tests

* Sync FreeBSD build command with others (and build Release by default)

* Fix non-default tile tests

* Fixed WEBP test for `libwebp.so.4`
This commit is contained in:
Hummeltech
2023-07-20 19:52:22 -07:00
committed by GitHub
parent f652ab1521
commit 24a5752d93
7 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/CMakeLists.txt
View File

@ -55,8 +55,9 @@ set(TILE_PNG256_SHA256SUM "${TILE_DEFAULT_SHA256SUM}")
set(TILE_PNG32_CMD "${CURL_EXECUTABLE} --fail --silent ${TILE_PNG32_URL}")
set(TILE_PNG32_SHA256SUM "1006d92152f1e18896e0016fb43201b14bbcf7655955b74495ad3610541d325b")
set(TILE_WEBP_CMD "${CURL_EXECUTABLE} --fail --silent ${TILE_WEBP_URL}")
set(TILE_WEBP_SHA256SUM_6 "96fc0455b2269a7bcd4a5b3c9844529c3c77e3bb15f56e72f78a5af3bc15b6b5") # libwebp6
set(TILE_WEBP_SHA256SUM_7 "a82ef9ba5dc333de88af7b645084c30ab2b01c664e17162cbf6659c287cc4df4") # libwebp7
set(TILE_WEBP_SHA256SUM_4 "ef3862a57831b21ec69c15be196e1e2b4fea66246c361142631b9fa22b85decc") # libwebp.so.4
set(TILE_WEBP_SHA256SUM_6 "96fc0455b2269a7bcd4a5b3c9844529c3c77e3bb15f56e72f78a5af3bc15b6b5") # libwebp.so.6
set(TILE_WEBP_SHA256SUM_7 "a82ef9ba5dc333de88af7b645084c30ab2b01c664e17162cbf6659c287cc4df4") # libwebp.so.7
configure_file(
renderd.conf.in
@ -146,23 +147,23 @@ add_test(
NAME download_tiles
COMMAND ${BASH} -c "
until $(${TILE_DEFAULT_CMD} --output tile.png); do
echo 'Sleeping 1s';
echo 'Sleeping 1s (DEFAULT)';
sleep 1;
done
until $(${TILE_JPG_CMD} --output tile.jpg); do
echo 'Sleeping 1s';
echo 'Sleeping 1s (JPG)';
sleep 1;
done
until $(${TILE_PNG256_CMD} --output tile.png256); do
echo 'Sleeping 1s';
echo 'Sleeping 1s (PNG256)';
sleep 1;
done
until $(${TILE_PNG32_CMD} --output tile.png32); do
echo 'Sleeping 1s';
echo 'Sleeping 1s (PNG32)';
sleep 1;
done
until $(${TILE_WEBP_CMD} --output tile.webp); do
echo 'Sleeping 1s';
echo 'Sleeping 1s (WEBP)';
sleep 1;
done
"
@ -174,7 +175,7 @@ add_test(
(echo '${TILE_JPG_SHA256SUM} tile.jpg' | ${SHA256SUM_EXECUTABLE} -c) && \
(echo '${TILE_PNG256_SHA256SUM} tile.png256' | ${SHA256SUM_EXECUTABLE} -c) && \
(echo '${TILE_PNG32_SHA256SUM} tile.png32' | ${SHA256SUM_EXECUTABLE} -c) && \
((echo '${TILE_WEBP_SHA256SUM_6} tile.webp' | ${SHA256SUM_EXECUTABLE} -c) || (echo '${TILE_WEBP_SHA256SUM_7} tile.webp' | ${SHA256SUM_EXECUTABLE} -c))
((echo '${TILE_WEBP_SHA256SUM_7} tile.webp' | ${SHA256SUM_EXECUTABLE} -c) || (echo '${TILE_WEBP_SHA256SUM_6} tile.webp' | ${SHA256SUM_EXECUTABLE} -c) || (echo '${TILE_WEBP_SHA256SUM_4} tile.webp' | ${SHA256SUM_EXECUTABLE} -c))
"
)
add_test(
@ -255,12 +256,12 @@ set_tests_properties(render_expired PROPERTIES
set_tests_properties(render_list PROPERTIES
DEPENDS render_speedtest
FIXTURES_REQUIRED httpd_started
TIMEOUT 20
TIMEOUT 60
)
set_tests_properties(render_old PROPERTIES
DEPENDS render_speedtest
FIXTURES_REQUIRED httpd_started
TIMEOUT 20
TIMEOUT 60
)
set_tests_properties(download_tiles PROPERTIES
FIXTURES_REQUIRED httpd_started

8
tests/renderd.conf.in
View File

@ -12,25 +12,25 @@ XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml
TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
TYPE=jpg image/jpeg jpeg
URI=/tiles/renderd-example-jpg
XML=@PROJECT_BINARY_DIR@/tests/www/mapnik.xml
XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml
[@MAP_NAME@_png256]
TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
TYPE=png image/png png256
URI=/tiles/renderd-example-png256
XML=@PROJECT_BINARY_DIR@/tests/www/mapnik.xml
XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml
[@MAP_NAME@_png32]
TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
TYPE=png image/png png32
URI=/tiles/renderd-example-png32
XML=@PROJECT_BINARY_DIR@/tests/www/mapnik.xml
XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml
[@MAP_NAME@_webp]
TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
TYPE=webp image/webp webp
URI=/tiles/renderd-example-webp
XML=@PROJECT_BINARY_DIR@/tests/www/mapnik.xml
XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml
[renderd1]
iphostname=127.0.0.1