test_provider_ogr_gpkg.py: pyflakes fixes

rouault · rouault · commit 348af7ed5267 · 2016-10-18T14:16:20.000+02:00
diff --git a/tests/src/python/test_provider_ogr_gpkg.py b/tests/src/python/test_provider_ogr_gpkg.py
@@ -17,12 +17,10 @@
 import os
 import tempfile
 import shutil
-import glob
 from osgeo import gdal, ogr
 
-from qgis.core import QgsVectorLayer, QgsFeature, QgsGeometry, QgsFeatureRequest
+from qgis.core import QgsVectorLayer, QgsFeature, QgsGeometry
 from qgis.testing import start_app, unittest
-from utilities import unitTestDataPath
 
 start_app()
 
@@ -57,14 +55,14 @@ def testSingleToMultiPolygonPromotion(self):
 
         tmpfile = os.path.join(self.basetestpath, 'testSingleToMultiPolygonPromotion.gpkg')
         ds = ogr.GetDriverByName('GPKG').CreateDataSource(tmpfile)
-        lyr = ds.CreateLayer('test', geom_type=ogr.wkbMultiPolygon)
+        ds.CreateLayer('test', geom_type=ogr.wkbMultiPolygon)
         ds = None
 
         vl = QgsVectorLayer('{}|layerid=0'.format(tmpfile), 'test', 'ogr')
         f = QgsFeature()
         f.setGeometry(QgsGeometry.fromWkt('POLYGON ((0 0,0 1,1 1,0 0))'))
         vl.dataProvider().addFeatures([f])
-        got = [f for f in vl.getFeatures()][0]
+        got = [feat for feat in vl.getFeatures()][0]
         got_geom = got.geometry()
         reference = QgsGeometry.fromWkt('MultiPolygon (((0 0, 0 1, 1 1, 0 0)))')
         # The geometries must be binarily identical
@@ -75,15 +73,15 @@ def testCurveGeometryType(self):
 
         tmpfile = os.path.join(self.basetestpath, 'testCurveGeometryType.gpkg')
         ds = ogr.GetDriverByName('GPKG').CreateDataSource(tmpfile)
-        lyr = ds.CreateLayer('test', geom_type=ogr.wkbCurvePolygon)
+        ds.CreateLayer('test', geom_type=ogr.wkbCurvePolygon)
         ds = None
 
         vl = QgsVectorLayer('{}'.format(tmpfile), 'test', 'ogr')
         self.assertEqual(vl.dataProvider().subLayers(), ['0:test:0:CurvePolygon'])
         f = QgsFeature()
         f.setGeometry(QgsGeometry.fromWkt('POLYGON ((0 0,0 1,1 1,0 0))'))
         vl.dataProvider().addFeatures([f])
-        got = [f for f in vl.getFeatures()][0]
+        got = [feat for feat in vl.getFeatures()][0]
         got_geom = got.geometry()
         reference = QgsGeometry.fromWkt('CurvePolygon (((0 0, 0 1, 1 1, 0 0)))')
         # The geometries must be binarily identical
@@ -148,13 +146,34 @@ def testBug15351_closeIter_commit_closeProvider(self):
 
     @unittest.expectedFailure(int(gdal.VersionInfo('VERSION_NUM')) < GDAL_COMPUTE_VERSION(2, 0, 0))
     # We need GDAL 2.0 to issue PRAGMA journal_mode
-    def testBug15351_closeIter_commit_closeProvider(self):
-        self.internalTestBug15351('closeIter_commit_closeProvider')
+    def testBug15351_commit_closeProvider_closeIter(self):
+        self.internalTestBug15351('commit_closeProvider_closeIter')
 
     @unittest.expectedFailure(int(gdal.VersionInfo('VERSION_NUM')) < GDAL_COMPUTE_VERSION(2, 0, 0))
     # We need GDAL 2.0 to issue PRAGMA journal_mode
     def testBug15351_commit_closeIter_closeProvider(self):
         self.internalTestBug15351('commit_closeIter_closeProvider')
 
+    def testSelectSubsetString(self):
+
+        tmpfile = os.path.join(self.basetestpath, 'testSelectSubsetString.gpkg')
+        ds = ogr.GetDriverByName('GPKG').CreateDataSource(tmpfile)
+        lyr = ds.CreateLayer('test', geom_type=ogr.wkbMultiPolygon)
+        lyr.CreateField(ogr.FieldDefn('foo', ogr.OFTString))
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f['foo'] = 'bar'
+        lyr.CreateFeature(f)
+        f =  None
+        f = ogr.Feature(lyr.GetLayerDefn())
+        f['foo'] = 'baz'
+        lyr.CreateFeature(f)
+        f =  None
+        ds = None
+
+        vl = QgsVectorLayer('{}|layerid=0'.format(tmpfile), 'test', 'ogr')
+        vl.setSubsetString("SELECT fid, foo FROM test WHERE foo = 'baz'")
+        got = [feat for feat in vl.getFeatures()]
+        self.assertEqual( len(got), 1 )
+
 if __name__ == '__main__':
     unittest.main()
