diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2017-03-10 11:14:48 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-03-10 07:31:09 +0100 |
| commit | 17dce5d84fae8247f65cd6202e731af4acd2bde7 (patch) | |
| tree | 82e91d925f8956b5281a51bebca1f6cf47ac0418 | |
| parent | bb4ad8dffea3c6e462f1055bd51fceed80a84952 (diff) | |
| download | samba-17dce5d84fae8247f65cd6202e731af4acd2bde7.tar.gz | |
perftests/ad_dc_search: do less work in expensive member searches
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/dsdb/tests/python/ad_dc_search_performance.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/dsdb/tests/python/ad_dc_search_performance.py b/source4/dsdb/tests/python/ad_dc_search_performance.py index ec4a02f056f..151fb69b666 100644 --- a/source4/dsdb/tests/python/ad_dc_search_performance.py +++ b/source4/dsdb/tests/python/ad_dc_search_performance.py @@ -202,7 +202,7 @@ class UserTests(samba.tests.TestCase): scope=SCOPE_SUBTREE, attrs=['cn']) - def _test_member_search(self): + def _test_member_search(self, rounds=10): expressions = [] for d in range(50): expressions.append('(member=cn=u%d,%s)' % (d + 500, self.ou_users)) @@ -214,7 +214,7 @@ class UserTests(samba.tests.TestCase): for expression in expressions: t = time.time() - for i in range(10): + for i in range(rounds): self.ldb.search(self.ou, expression=expression, scope=SCOPE_SUBTREE, @@ -266,7 +266,8 @@ class UserTests(samba.tests.TestCase): test_01_10_complex_search_3k_users = _test_complex_search test_01_11_unindexed_search_3k_users = _test_unindexed_search test_01_12_indexed_search_3k_users = _test_indexed_search - test_01_13_member_search_3k_users = _test_member_search + def test_01_13_member_search_3k_users(self): + self._test_member_search(rounds=5) test_02_01_link_users_1000 = _test_link_many_users test_02_02_link_users_2000 = _test_link_many_users @@ -275,7 +276,8 @@ class UserTests(samba.tests.TestCase): test_03_10_complex_search_linked_users = _test_complex_search test_03_11_unindexed_search_linked_users = _test_unindexed_search test_03_12_indexed_search_linked_users = _test_indexed_search - test_03_12_member_search_linked_users = _test_member_search + def test_03_13_member_search_linked_users(self): + self._test_member_search(rounds=2) if "://" not in host: if os.path.isfile(host): |