From: Douglas Bagnall Date: Thu, 29 Aug 2024 00:38:27 +0000 (+1200) Subject: ldb:test:api_search: use @unittest.skipIf for LMDB tests X-Git-Tag: tdb-1.4.13~1156 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1871eb9d1cbc94c2a429f7db630e4b124f49a0ed;p=thirdparty%2Fsamba.git ldb:test:api_search: use @unittest.skipIf for LMDB tests Signed-off-by: Douglas Bagnall Reviewed-by: Andreas Schneider --- diff --git a/lib/ldb/tests/python/api_search.py b/lib/ldb/tests/python/api_search.py index 6efbfcfb731..45b62df64dc 100644 --- a/lib/ldb/tests/python/api_search.py +++ b/lib/ldb/tests/python/api_search.py @@ -9,6 +9,8 @@ import ldb import gc import time import shutil +import unittest + from api_base import ( MDB_PREFIX, @@ -1193,6 +1195,7 @@ class SearchTests(LdbBaseTest): # Run the search tests against an lmdb backend +@unittest.skipIf(os.getenv('HAVE_LMDB') == '0', "No lmdb backend") class SearchTestsLmdb(SearchTests): prefix = MDB_PREFIX @@ -1200,12 +1203,6 @@ class SearchTestsLmdb(SearchTests): def add_index(cls, db): db.add(MDB_INDEX_OBJ) - @classmethod - def setUpClass(cls): - if os.environ.get('HAVE_LMDB', '1') == '0': - cls.skipTest("No lmdb backend") - super().setUpClass() - class IndexedSearchTests(SearchTests): """Test searches using the index, to ensure the index doesn't @@ -1344,35 +1341,20 @@ class GUIDAndOneLevelIndexedSearchTests(SearchTests): "checkBaseOnSearch": "TRUE"}) +@unittest.skipIf(os.getenv('HAVE_LMDB') == '0', "No lmdb backend") class GUIDIndexedSearchTestsLmdb(GUIDIndexedSearchTests): prefix = MDB_PREFIX - @classmethod - def setUpClass(cls): - if os.environ.get('HAVE_LMDB', '1') == '0': - cls.skipTest("No lmdb backend") - super().setUpClass() - +@unittest.skipIf(os.getenv('HAVE_LMDB') == '0', "No lmdb backend") class GUIDIndexedDNFilterSearchTestsLmdb(GUIDIndexedDNFilterSearchTests): prefix = MDB_PREFIX - @classmethod - def setUpClass(cls): - if os.environ.get('HAVE_LMDB', '1') == '0': - cls.skipTest("No lmdb backend") - super().setUpClass() - +@unittest.skipIf(os.getenv('HAVE_LMDB') == '0', "No lmdb backend") class GUIDAndOneLevelIndexedSearchTestsLmdb(GUIDAndOneLevelIndexedSearchTests): prefix = MDB_PREFIX - @classmethod - def setUpClass(cls): - if os.environ.get('HAVE_LMDB', '1') == '0': - cls.skipTest("No lmdb backend") - super().setUpClass() - class LdbResultTests(LdbBaseTest): @classmethod @@ -1662,6 +1644,7 @@ class LdbResultTests(LdbBaseTest): self.assertEqual(got_pid, pid) +@unittest.skipIf(os.getenv('HAVE_LMDB') == '0', "No lmdb backend") class LdbResultTestsLmdb(LdbResultTests): prefix = MDB_PREFIX @@ -1669,12 +1652,6 @@ class LdbResultTestsLmdb(LdbResultTests): def add_index(cls, db): db.add(MDB_INDEX_OBJ) - @classmethod - def setUpClass(cls): - if os.environ.get('HAVE_LMDB', '1') == '0': - cls.skipTest("No lmdb backend") - super().setUpClass() - class NestedTransactionTests(LdbBaseTest): def setUp(self): @@ -1764,6 +1741,7 @@ class NestedTransactionTests(LdbBaseTest): self.assertEqual(len(res), 1) +@unittest.skipIf(os.getenv('HAVE_LMDB') == '0', "No lmdb backend") class LmdbNestedTransactionTests(NestedTransactionTests): prefix = MDB_PREFIX @@ -1771,13 +1749,6 @@ class LmdbNestedTransactionTests(NestedTransactionTests): def add_index(cls, db): db.add(MDB_INDEX_OBJ) - @classmethod - def setUpClass(cls): - if os.environ.get('HAVE_LMDB', '1') == '0': - cls.skipTest("No lmdb backend") - super().setUpClass() - if __name__ == '__main__': - import unittest unittest.TestProgram()