Merge pull request #5551 from pblottiere/reenable_wms_server_tests

[travis] Re-enable WMS tests for server
qgis · Nov 8, 2017 · 1119dc8 · 1119dc8
2 parents 940c4ed + 24f38ab
commit 1119dc8
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 4 deletions.
diff --git a/.ci/travis/linux/blacklist.txt b/.ci/travis/linux/blacklist.txt
@@ -31,7 +31,3 @@ PyQgsServerAccessControl
 # Need a local postgres installation
 PyQgsAuthManagerPKIPostgresTest
 PyQgsAuthManagerPasswordPostgresTest
-
-# need fixing
-# https://travis-ci.org/qgis/QGIS/jobs/296864934
-PyQgsServerWMS
diff --git a/...ntrol_images/qgis_server/WMS_GetMap_Annotations/WMS_GetMap_Annotations_mask.png b/...ntrol_images/qgis_server/WMS_GetMap_Annotations/WMS_GetMap_Annotations_mask.png
diff --git a/...ntrol_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom_mask.png b/...ntrol_images/qgis_server/WMS_GetMap_StyleCustom/WMS_GetMap_StyleCustom_mask.png
diff --git a/...ta/control_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight.png b/...ta/control_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight.png
diff --git a/...ntrol_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight_mask.png b/...ntrol_images/qgis_server/WMS_GetPrint_Highlight/WMS_GetPrint_Highlight_mask.png
diff --git a/...images/qgis_server/WMS_GetPrint_LabelUpdated/WMS_GetPrint_LabelUpdated_mask.png b/...images/qgis_server/WMS_GetPrint_LabelUpdated/WMS_GetPrint_LabelUpdated_mask.png
diff --git a/...a/control_images/qgis_server/WMS_GetPrint_Opacity/WMS_GetPrint_Opacity_mask.png b/...a/control_images/qgis_server/WMS_GetPrint_Opacity/WMS_GetPrint_Opacity_mask.png
diff --git a/tests/testdata/control_images/qgis_server/WMS_GetPrint_SRS/WMS_GetPrint_SRS.png b/tests/testdata/control_images/qgis_server/WMS_GetPrint_SRS/WMS_GetPrint_SRS.png
diff --git a/.../testdata/control_images/qgis_server/WMS_GetPrint_SRS/WMS_GetPrint_SRS_mask.png b/.../testdata/control_images/qgis_server/WMS_GetPrint_SRS/WMS_GetPrint_SRS_mask.png
diff --git a/...ontrol_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom.png b/...ontrol_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom.png
diff --git a/...l_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom_mask.png b/...l_images/qgis_server/WMS_GetPrint_StyleCustom/WMS_GetPrint_StyleCustom_mask.png