summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>2016-07-12 14:07:13 +1200
committerAndrew Bartlett <abartlet@samba.org>2016-07-19 13:41:12 +0200
commit929ec47c2a6716173e3d5e2ffa76684c3013cc30 (patch)
tree831f1180e7d61d861513e443d6452c431537491f /source4
parent12dce74b80aa0c8522920f08a1bb4f12710dadf2 (diff)
downloadsamba-929ec47c2a6716173e3d5e2ffa76684c3013cc30.tar.gz
VLV tests: reduce test duplication hence elapsed time
This makes before/after lattice sparser for the slower tests. While we're doing that, some of the tests are changed to traverse the lattice in a different order just in case that matters. There is very little chance that any particular combination of before and after parameters will behave uniquely wrongly. Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source4')
-rw-r--r--source4/dsdb/tests/python/vlv.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/dsdb/tests/python/vlv.py b/source4/dsdb/tests/python/vlv.py
index 660d5b6cdc6..1f5cf15b509 100644
--- a/source4/dsdb/tests/python/vlv.py
+++ b/source4/dsdb/tests/python/vlv.py
@@ -356,8 +356,8 @@ class VLVTests(samba.tests.TestCase):
sort_control = "server_sort:1:0:%s" % attr
res = None
n = len(self.users)
- for before in range(0, 9):
- for after in range(0, 9):
+ for before in [10, 0, 3, 1, 4, 5, 2]:
+ for after in [0, 3, 1, 4, 5, 2, 7]:
for offset in range(max(1, before - 2),
min(n - after + 2, n)):
if res is None:
@@ -774,8 +774,8 @@ class VLVTests(samba.tests.TestCase):
random.shuffle(gte_tests)
res = None
sort_control = "server_sort:1:0:%s" % attr
- for before in range(0, 5):
- for after in range(0, 7):
+ for before in [0, 1, 2, 4]:
+ for after in [0, 1, 3, 6]:
for gte in gte_tests:
if res is not None:
cookie = get_cookie(res.controls, len(self.users))
@@ -816,8 +816,8 @@ class VLVTests(samba.tests.TestCase):
random.shuffle(gte_tests)
sort_control = "server_sort:1:0:%s" % attr
- for before in range(0, 4):
- for after in range(0, 5):
+ for before in [0, 1, 3]:
+ for after in [0, 4]:
for gte in gte_tests:
if attr == 'audio' and 0:
import pdb