Add control image for atlas GetPrint test and fix some python stuff

qgis · Jan 5, 2019 · df8940c · df8940c
1 parent 23669b6
commit df8940c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/tests/src/python/test_qgsserver_wms_getprint.py b/tests/src/python/test_qgsserver_wms_getprint.py
@@ -423,9 +423,8 @@ def test_wms_getprint_atlas( self ):
             "CRS": "EPSG:3857",
             "ATLAS_PK": "3",
         }.items())])
-
-        r, h = self._result(self._execute_request(qs))
-        self._img_diff_error(r, h, "WMS_GetPrint_Atlas")
+       r, h = self._result(self._execute_request(qs))
+       self._img_diff_error(r, h, "WMS_GetPrint_Atlas")
 
     def test_wms_getprint_atlas_getProjectSettings( self ):
        qs = "?" + "&".join(["%s=%s" % i for i in list({
@@ -434,10 +433,9 @@ def test_wms_getprint_atlas_getProjectSettings( self ):
             "VERSION": "1.3.0",
             "REQUEST": "GetProjectSettings",
         }.items())])
-
-        r, h = self._result(self._execute_request(qs))
-        self.assertTrue( 'atlasEnabled="1"' in r )
-        self.assertTrue( '<PrimaryKeyAttribute>' in r )
+       r, h = self._result(self._execute_request(qs))
+       self.assertTrue( 'atlasEnabled="1"' in str( r ) )
+       self.assertTrue( '<PrimaryKeyAttribute>' in str( r ) )
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/...s/testdata/control_images/qgis_server/WMS_GetPrint_Atlas/WMS_GetPrint_Atlas.png b/...s/testdata/control_images/qgis_server/WMS_GetPrint_Atlas/WMS_GetPrint_Atlas.png