Set system locale and thousand separator for test consistency

qgis · Apr 5, 2019 · 260e9ad · 260e9ad
1 parent 22738bc
commit 260e9ad
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/tests/src/python/test_qgsserver.py b/tests/src/python/test_qgsserver.py
@@ -130,6 +130,9 @@ def setUp(self):
         self.projectUseLayerIdsPath = os.path.join(d, "project_use_layerids.qgs")
         self.projectGroupsPath = os.path.join(d, "project_groups.qgs")
 
+        os.environ['QGIS_SERVER_SHOW_GROUP_SEPARATOR'] = '0'
+        os.environ['QGIS_SERVER_OVERRIDE_SYSTEM_LOCALE'] = 'en'
+
         # Clean env just to be sure
         env_vars = ['QUERY_STRING', 'QGIS_PROJECT_FILE']
         for ev in env_vars:

diff --git a/tests/testdata/qgis_server/getprojectsettings.txt b/tests/testdata/qgis_server/getprojectsettings.txt
@@ -1,4 +1,6 @@
+Response:
 *****
+
 Content-Type: text/xml; charset=utf-8
 <?xml version="1.0" encoding="utf-8"?>
 <WMS_Capabilities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:qgs="http://www.qgis.org/wms" xmlns="http://www.opengis.net/wms" xsi:schemaLocation="http://www.opengis.net/wms http://schemas.opengis.net/wms/1.3.0/capabilities_1_3_0.xsd http://www.opengis.net/sld http://schemas.opengis.net/sld/1.1.0/sld_capabilities.xsd https://www.qgis.org/?*****" version="1.3.0" xmlns:sld="http://www.opengis.net/sld">
@@ -292,3 +294,4 @@ Content-Type: text/xml; charset=utf-8
   <LayerDrawingOrder>testlayer3,testlayer2,testlayer èé,layer_with_short_name</LayerDrawingOrder>
  </Capability>
 </WMS_Capabilities>
+
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_group_name_areas.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_group_name_areas.txt
@@ -26,7 +26,7 @@ umrisstyp = 'durchgezogen'
 umrissstaerke = '1'
 umrissstaerke_prt = '3.00'
 umfang = '758.4703'
-flaeche = '12,879'
+flaeche = '12879'
 bemerkung = ''
 last_change = '2013-06-11 10:03:45.52301+02'
 
diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_group_name_areas_cities.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_group_name_areas_cities.txt
@@ -26,7 +26,7 @@ umrisstyp = 'durchgezogen'
 umrissstaerke = '1'
 umrissstaerke_prt = '3.00'
 umfang = '758.4703'
-flaeche = '12,879'
+flaeche = '12879'
 bemerkung = ''
 last_change = '2013-06-11 10:03:45.52301+02'
 

diff --git a/tests/testdata/qgis_server/wms_getfeatureinfo_group_query_child.txt b/tests/testdata/qgis_server/wms_getfeatureinfo_group_query_child.txt
@@ -24,7 +24,7 @@ umrisstyp = 'durchgezogen'
 umrissstaerke = '1'
 umrissstaerke_prt = '3.00'
 umfang = '758.4703'
-flaeche = '12,879'
+flaeche = '12879'
 bemerkung = ''
 last_change = '2013-06-11 10:03:45.52301+02'