From 7044e115168239756d9e5f1ae1afffa9d831b97b Mon Sep 17 00:00:00 2001 From: Ondrej Pesek Date: Tue, 6 Jun 2023 11:16:05 +0200 Subject: [PATCH] unittest: fix assertNotRegexMatches() removed from python 3.12 (#3011) --- scripts/db.dropcolumn/testsuite/test_db_dropcolumn.py | 2 +- scripts/db.droptable/testsuite/test_db_droptable.py | 2 +- scripts/v.db.addtable/testsuite/test_v_db_addtable.py | 2 +- scripts/v.db.dropcolumn/testsuite/test_v_db_dropcolumn.py | 2 +- scripts/v.db.droptable/testsuite/test_v_db_droptable.py | 2 +- scripts/v.db.renamecolumn/testsuite/test_v_db_renamecolumn.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/db.dropcolumn/testsuite/test_db_dropcolumn.py b/scripts/db.dropcolumn/testsuite/test_db_dropcolumn.py index 6b4100c88ff..dcbda092efc 100644 --- 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 index f88403fa2f3..aa139ec870d 100644 --- 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 index a03ac925dd3..e6d4f54fbe8 100644 --- 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 index 3519a85e6d8..878b1e55da0 100644 --- 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 index 8d89d9b0866..ba8ac6f8592 100644 --- 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 index fa9b0043de6..ec63b6552c6 100644 --- 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__":