Merge pull request #35093 from nirvn/because

Because testing is nicer...
qgis · Mar 15, 2020 · 59c7579 · 59c7579
2 parents 47070a7 + 92ed232
commit 59c7579
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.ci/travis/linux/scripts/test_flaky.txt b/.ci/travis/linux/scripts/test_flaky.txt
@@ -4,9 +4,6 @@ qgis_wcsprovidertest
 PyQgsWFSProviderGUI
 qgis_ziplayertest
 
-# Flaky, see https://dash.orfeo-toolbox.org/testDetails.php?test=63061783&build=297405
-PyQgsSpatialiteProvider
-
 # Flaky, the ms odbc driver crashes a lot on the ubuntu docker image. Retest when
 # the docker base image is upgraded
 PyQgsMssqlProvider

diff --git a/tests/src/python/test_provider_spatialite.py b/tests/src/python/test_provider_spatialite.py
@@ -770,7 +770,7 @@ def testSubsetStringRegexp(self):
         testPath = "dbname=%s table='test_filter' (geometry) key='id'" % self.dbname
         vl = QgsVectorLayer(testPath, 'test', 'spatialite')
         self.assertTrue(vl.isValid())
-        vl.setSubsetString('"name" REGEXP \'[txe]\'')
+        vl.setSubsetString('"name" REGEXP \'[txe]{3}\'')
         self.assertEqual(vl.featureCount(), 4)
         del(vl)
 
@@ -837,7 +837,7 @@ def testEncodeUri(self):
 
         parts = {'path': filename, 'layerName': 'test'}
         uri = registry.encodeUri('spatialite', parts)
-        self.assertEqual(uri, 'dbname=\'{}\' table="test" (geometry) sql='.format(filename))
+        self.assertEqual(uri, 'dbname=\'{}\' table="test"'.format(filename))
 
     def testPKNotInt(self):
         """ Check when primary key is not an integer """