Update legend test masks, fix for PyQt5

(cherry-picked from 7f2bdcf)
qgis · Jul 19, 2016 · c105567 · c105567
1 parent be0d0c0
commit c105567
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tests/src/python/test_qgscomposerlegend.py b/tests/src/python/test_qgscomposerlegend.py
@@ -75,7 +75,7 @@ def testInitialSizeSymbolMapUnits(self):
         result, message = checker.testComposition()
         self.assertTrue(result, message)
 
-        QgsMapLayerRegistry.instance().removeMapLayers([point_layer])
+        QgsMapLayerRegistry.instance().removeMapLayers([point_layer.id()])
 
     def testResizeWithMapContent(self):
         """Test test legend resizes to match map content"""
@@ -113,7 +113,7 @@ def testResizeWithMapContent(self):
         result, message = checker.testComposition()
         self.assertTrue(result, message)
 
-        QgsMapLayerRegistry.instance().removeMapLayers([point_layer])
+        QgsMapLayerRegistry.instance().removeMapLayers([point_layer.id()])
 
     def testResizeDisabled(self):
         """Test that test legend does not resize if auto size is disabled"""
@@ -155,7 +155,7 @@ def testResizeDisabled(self):
         result, message = checker.testComposition()
         self.assertTrue(result, message)
 
-        QgsMapLayerRegistry.instance().removeMapLayers([point_layer])
+        QgsMapLayerRegistry.instance().removeMapLayers([point_layer.id()])
 
     def testResizeDisabledCrop(self):
         """Test that if legend resizing is disabled, and legend is too small, then content is cropped"""
@@ -197,7 +197,7 @@ def testResizeDisabledCrop(self):
         result, message = checker.testComposition()
         self.assertTrue(result, message)
 
-        QgsMapLayerRegistry.instance().removeMapLayers([point_layer])
+        QgsMapLayerRegistry.instance().removeMapLayers([point_layer.id()])
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/...nd/expected_composer_legend_noresize/expected_composer_legend_noresize_mask.png b/...nd/expected_composer_legend_noresize/expected_composer_legend_noresize_mask.png
diff --git a/...d_composer_legend_noresize_crop/expected_composer_legend_noresize_crop_mask.png b/...d_composer_legend_noresize_crop/expected_composer_legend_noresize_crop_mask.png
diff --git a/...ted_composer_legend_size_content/expected_composer_legend_size_content_mask.png b/...ted_composer_legend_size_content/expected_composer_legend_size_content_mask.png