unittest: fix assertNotRegexMatches() removed from python 3.12 (OSGeo…

…#3011)
nilason · Nov 7, 2023 · 7044e11 · 7044e11
1 parent decf7b8
commit 7044e11
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/scripts/db.dropcolumn/testsuite/test_db_dropcolumn.py b/scripts/db.dropcolumn/testsuite/test_db_dropcolumn.py
@@ -46,7 +46,7 @@ def test_drop_column_with_force(self):
 
         m = SimpleModule("db.columns", table=self.mapName)
         self.assertModule(m)
-        self.assertNotRegexpMatches(decode(m.outputs.stdout), self.colName)
+        self.assertNotRegex(decode(m.outputs.stdout), self.colName)
 
 
 if __name__ == "__main__":

diff --git a/scripts/db.droptable/testsuite/test_db_droptable.py b/scripts/db.droptable/testsuite/test_db_droptable.py
@@ -43,7 +43,7 @@ def test_drop_table_with_force(self):
 
         m = SimpleModule("db.tables", flags="p")
         self.assertModule(m)
-        self.assertNotRegexpMatches(decode(m.outputs.stdout), self.mapName)
+        self.assertNotRegex(decode(m.outputs.stdout), self.mapName)
 
 
 if __name__ == "__main__":

diff --git a/scripts/v.db.addtable/testsuite/test_v_db_addtable.py b/scripts/v.db.addtable/testsuite/test_v_db_addtable.py
@@ -36,7 +36,7 @@ def test_add_single_columned_table_check(self):
 
         m = SimpleModule("v.info", map="myroads", flags="c")
         self.assertModule(m)
-        self.assertNotRegexpMatches(decode(m.outputs.stdout), "slope")
+        self.assertNotRegex(decode(m.outputs.stdout), "slope")
 
         m = SimpleModule("v.info", map="myroads", flags="c", layer=2)
         self.assertModule(m)

diff --git a/scripts/v.db.dropcolumn/testsuite/test_v_db_dropcolumn.py b/scripts/v.db.dropcolumn/testsuite/test_v_db_dropcolumn.py
@@ -32,7 +32,7 @@ def test_drop_single_column_check(self):
 
         m = SimpleModule("v.info", map="myroads", flags="c")
         self.assertModule(m)
-        self.assertNotRegexpMatches(decode(m.outputs.stdout), "SHAPE_LEN")
+        self.assertNotRegex(decode(m.outputs.stdout), "SHAPE_LEN")
 
 
 if __name__ == "__main__":

diff --git a/scripts/v.db.droptable/testsuite/test_v_db_droptable.py b/scripts/v.db.droptable/testsuite/test_v_db_droptable.py
@@ -41,7 +41,7 @@ def test_drop_table_with_force(self):
 
         m = SimpleModule("db.tables", flags="p")
         self.assertModule(m)
-        self.assertNotRegexpMatches(decode(m.outputs.stdout), "myroads")
+        self.assertNotRegex(decode(m.outputs.stdout), "myroads")
 
 
 if __name__ == "__main__":

diff --git a/scripts/v.db.renamecolumn/testsuite/test_v_db_renamecolumn.py b/scripts/v.db.renamecolumn/testsuite/test_v_db_renamecolumn.py
@@ -35,7 +35,7 @@ def test_rename_column(self):
         m = SimpleModule("v.info", flags="c", map="myroads")
         self.assertModule(m)
         self.assertRegexpMatches(decode(m.outputs.stdout), "roadname")
-        self.assertNotRegexpMatches(decode(m.outputs.stdout), "ROAD_NAME")
+        self.assertNotRegex(decode(m.outputs.stdout), "ROAD_NAME")
 
 
 if __name__ == "__main__":