From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Thu, 29 Aug 2024 00:52:13 +0000 (+1200)
Subject: ldb:test:api_search: shift remaining setUp adds to class add_index
X-Git-Tag: tdb-1.4.13~1154
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d47fc749aef6822f11036ae3f93d11886c4f9bc;p=thirdparty%2Fsamba.git

ldb:test:api_search: shift remaining setUp adds to class add_index

Before:

ldb.python.api_search -> 52
ldb.python.api_search.tr -> 48

After:

ldb.python.api_search.tr -> 10
ldb.python.api_search -> 9

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Sep 24 10:38:03 UTC 2024 on atb-devel-224
---

diff --git a/lib/ldb/tests/python/api_search.py b/lib/ldb/tests/python/api_search.py
index d0204c85a9e..cb12bc8ffab 100644
--- a/lib/ldb/tests/python/api_search.py
+++ b/lib/ldb/tests/python/api_search.py
@@ -1208,10 +1208,11 @@ class IndexedSearchTests(SearchTests):
     """Test searches using the index, to ensure the index doesn't
        break things"""
     IDX = True
-    def setUp(self):
-        super().setUp()
-        self.l.add({"dn": "@INDEXLIST",
-                    "@IDXATTR": [b"x", b"y", b"ou"]})
+
+    @classmethod
+    def add_index(cls, db):
+        db.add({"dn": "@INDEXLIST",
+                "@IDXATTR": [b"x", b"y", b"ou"]})
 
 
 class IndexedCheckSearchTests(IndexedSearchTests):
@@ -1225,13 +1226,14 @@ class IndexedSearchDnFilterTests(SearchTests):
        break things"""
     disallowDNFilter = True
     IDX = True
-    def setUp(self):
-        super().setUp()
-        self.l.add({"dn": "@OPTIONS",
-                    "disallowDNFilter": "TRUE"})
 
-        self.l.add({"dn": "@INDEXLIST",
-                    "@IDXATTR": [b"x", b"y", b"ou"]})
+    @classmethod
+    def add_index(cls, db):
+        db.add({"dn": "@OPTIONS",
+                "disallowDNFilter": "TRUE"})
+
+        db.add({"dn": "@INDEXLIST",
+               "@IDXATTR": [b"x", b"y", b"ou"]})
 
 
 
@@ -1241,11 +1243,11 @@ class IndexedAndOneLevelSearchTests(SearchTests):
     IDX = True
     IDXONE = True
 
-    def setUp(self):
-        super().setUp()
-        self.l.add({"dn": "@INDEXLIST",
-                    "@IDXATTR": [b"x", b"y", b"ou"],
-                    "@IDXONE": [b"1"]})
+    @classmethod
+    def add_index(cls, db):
+        db.add({"dn": "@INDEXLIST",
+                "@IDXATTR": [b"x", b"y", b"ou"],
+                "@IDXONE": [b"1"]})
 
 
 class IndexedCheckedAndOneLevelSearchTests(IndexedAndOneLevelSearchTests):
@@ -1262,15 +1264,15 @@ class IndexedAndOneLevelDNFilterSearchTests(SearchTests):
     IDX = True
     IDXONE = True
 
-    def setUp(self):
-        super().setUp()
-        self.l.add({"dn": "@OPTIONS",
-                    "disallowDNFilter": "TRUE",
-                    "checkBaseOnSearch": "TRUE"})
+    @classmethod
+    def add_index(cls, db):
+        db.add({"dn": "@OPTIONS",
+                "disallowDNFilter": "TRUE",
+                "checkBaseOnSearch": "TRUE"})
 
-        self.l.add({"dn": "@INDEXLIST",
-                    "@IDXATTR": [b"x", b"y", b"ou"],
-                    "@IDXONE": [b"1"]})
+        db.add({"dn": "@INDEXLIST",
+                "@IDXATTR": [b"x", b"y", b"ou"],
+                "@IDXONE": [b"1"]})
 
 
 class GUIDIndexedSearchTests(SearchTests):
@@ -1300,12 +1302,9 @@ class GUIDIndexedDNFilterSearchTests(SearchTests):
                 "@IDXATTR": [b"x", b"y", b"ou"],
                 "@IDXGUID": [b"objectUUID"],
                 "@IDX_DN_GUID": [b"GUID"]})
-
-    def setUp(self):
-        super().setUp()
-        self.l.add({"dn": "@OPTIONS",
-                    "disallowDNFilter": "TRUE",
-                    "checkBaseOnSearch": "TRUE"})
+        db.add({"dn": "@OPTIONS",
+                "disallowDNFilter": "TRUE",
+                "checkBaseOnSearch": "TRUE"})
 
 
 class GUIDAndOneLevelIndexedSearchTests(SearchTests):
@@ -1324,12 +1323,9 @@ class GUIDAndOneLevelIndexedSearchTests(SearchTests):
              "@IDXONE": [b"1"],
              "@IDXGUID": [b"objectUUID"],
              "@IDX_DN_GUID": [b"GUID"]})
-
-    def setUp(self):
-        super().setUp()
-        self.l.add({"dn": "@OPTIONS",
-                    "disallowDNFilter": "TRUE",
-                    "checkBaseOnSearch": "TRUE"})
+        db.add({"dn": "@OPTIONS",
+                "disallowDNFilter": "TRUE",
+                "checkBaseOnSearch": "TRUE"})
 
 
 @unittest.skipIf(os.getenv('HAVE_LMDB') == '0', "No lmdb backend")