Travis fixes

qgis · Mar 24, 2020 · ffda225 · ffda225
1 parent bff71e4
commit ffda225
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/python/plugins/processing/gui/BatchPanel.py b/python/plugins/processing/gui/BatchPanel.py
@@ -69,7 +69,8 @@
     QgsProcessingParameterWidgetContext,
     QgsProcessingContextGenerator,
     QgsFindFilesByPatternDialog,
-    QgsExpressionBuilderDialog
+    QgsExpressionBuilderDialog,
+    QgsPanelWidget
 )
 from qgis.utils import iface
 
@@ -269,7 +270,7 @@ def populateByExpression(self, adding=False):
                 self.setRowValue(row, value, context)
 
 
-class BatchPanel(BASE, WIDGET):
+class BatchPanel(QgsPanelWidget, WIDGET):
     PARAMETERS = "PARAMETERS"
     OUTPUTS = "OUTPUTS"
 

diff --git a/python/plugins/processing/tests/GuiTest.py b/python/plugins/processing/tests/GuiTest.py
@@ -33,7 +33,8 @@
                        QgsProcessingParameterRasterDestination,
                        QgsProcessingParameterRange,
                        QgsFeature,
-                       QgsVectorLayer,
+                       QgsProcessingModelAlgorithm,
+                       QgsUnitTypes,
                        QgsProject)
 from qgis.analysis import QgsNativeAlgorithms
 
@@ -53,7 +54,7 @@ class AlgorithmDialogTest(unittest.TestCase):
     def testCreation(self):
         alg = QgsApplication.processingRegistry().createAlgorithmById('native:centroids')
         a = AlgorithmDialog(alg)
-        self.assertEqual(a.mainWidget().alg, alg)
+        self.assertEqual(a.mainWidget().algorithm(), alg)
 
 
 class WrappersTest(unittest.TestCase):

diff --git a/tests/src/python/test_qgsxmlutils.py b/tests/src/python/test_qgsxmlutils.py
@@ -261,7 +261,7 @@ def test_feature_source_definition(self):
         self.assertEqual(c.source.staticValue(), 'my source')
         self.assertTrue(c.selectedFeaturesOnly)
         self.assertEqual(c.featureLimit, 27)
-        self.assertEqual(c.flags, QgsProcessingFeatureSourceDefinition.Flag.FlagCreateIndividualOutputPerInputFeature)
+        self.assertEqual(int(c.flags), int(QgsProcessingFeatureSourceDefinition.Flag.FlagCreateIndividualOutputPerInputFeature))
         self.assertEqual(c.geometryCheck, QgsFeatureRequest.GeometrySkipInvalid)
 
     def test_output_layer_definition(self):