diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2017-10-25 12:57:09 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2017-10-26 05:36:11 +0200 |
| commit | 30584a278acf542d813eec04ce92a67281ea590f (patch) | |
| tree | a9cf5b434faa7f8ced2037df680b16a9413d5f90 /source4/dsdb | |
| parent | 1e62bbaeac8f3ea44b7b2091d0d1c7ebe0d5e6ff (diff) | |
| download | samba-30584a278acf542d813eec04ce92a67281ea590f.tar.gz | |
linked attribute tests: correct add_all_at_once test
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Thu Oct 26 05:36:11 CEST 2017 on sn-devel-144
Diffstat (limited to 'source4/dsdb')
| -rw-r--r-- | source4/dsdb/tests/python/linked_attributes.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source4/dsdb/tests/python/linked_attributes.py b/source4/dsdb/tests/python/linked_attributes.py index d18a667c4fe..09f83f8ca4f 100644 --- a/source4/dsdb/tests/python/linked_attributes.py +++ b/source4/dsdb/tests/python/linked_attributes.py @@ -616,14 +616,11 @@ class LATests(samba.tests.TestCase): (g2,) = self.add_objects(1, 'group', 'g_all_at_once2', more_attrs={'member': users[:5]}) - try: - self.add_objects(1, 'group', 'g_with_duplicate_links', - more_attrs={'member': users[:5] + users[1:2]}) - except ldb.LdbError as (num, msg): - if num != ldb.ERR_ENTRY_ALREADY_EXISTS: - self.fail("adding duplicate values, expected " - "ERR_ENTRY_ALREADY_EXISTS, (%d) " - "got %d" % (ldb.ERR_ENTRY_ALREADY_EXISTS, num)) + self.assertRaisesLdbError(ldb.ERR_ENTRY_ALREADY_EXISTS, + "adding multiple duplicate values", + self.add_objects, 1, 'group', + 'g_with_duplicate_links', + more_attrs={'member': users[:5] + users[1:2]}) self.assert_forward_links(g1, users) self.assert_forward_links(g2, users[:5]) |