Skip to content

Commit

Permalink
Fix intermittently failing test (python was garbage collecting too ea…
Browse files Browse the repository at this point in the history
…rly)
  • Loading branch information
nyalldawson committed Dec 6, 2019
1 parent 46e6b2d commit 6cd5ade
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions tests/src/python/test_qgslabelsettingswidget.py
Expand Up @@ -37,8 +37,11 @@ def testBase(self):
props.setProperty(QgsPalLayerSettings.IsObstacle, QgsProperty.fromValue(True))
w.setDataDefinedProperties(props)
self.assertEqual(len(spy), 0)
self.assertEqual(w.dataDefinedProperties().property(QgsPalLayerSettings.ObstacleFactor).asExpression(), '5')
self.assertEqual(w.dataDefinedProperties().property(QgsPalLayerSettings.IsObstacle).asExpression(), 'TRUE')
dd_props = w.dataDefinedProperties()
prop = dd_props.property(QgsPalLayerSettings.ObstacleFactor)
self.assertEqual(prop.asExpression(), '5')
prop = dd_props.property(QgsPalLayerSettings.IsObstacle)
self.assertEqual(prop.asExpression(), 'TRUE')

def testObstacles(self):
w = QgsLabelObstacleSettingsWidget()
Expand Down Expand Up @@ -67,7 +70,9 @@ def testObstacles(self):
self.assertFalse(props.isActive(QgsPalLayerSettings.ObstacleFactor))
w.updateDataDefinedProperties(props)
self.assertTrue(props.isActive(QgsPalLayerSettings.ObstacleFactor))
self.assertEqual(w.dataDefinedProperties().property(QgsPalLayerSettings.ObstacleFactor).asExpression(), '5')
props = w.dataDefinedProperties()
prop = props.property(QgsPalLayerSettings.ObstacleFactor)
self.assertEqual(prop.asExpression(), '5')


if __name__ == '__main__':
Expand Down

0 comments on commit 6cd5ade

Please sign in to comment.