From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Thu, 24 Aug 2023 22:58:05 +0000 (+1200)
Subject: tests/krb5: Re-raise any LdbError other than ERR_ENTRY_ALREADY_EXISTS
X-Git-Tag: tevent-0.16.0~758
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b4b03e5e79d02385dc5508bc115ac8f21f31769;p=thirdparty%2Fsamba.git

tests/krb5: Re-raise any LdbError other than ERR_ENTRY_ALREADY_EXISTS

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/tests/krb5/kdc_base_test.py b/python/samba/tests/krb5/kdc_base_test.py
index 87de2fd5032..6d47b3feca7 100644
--- a/python/samba/tests/krb5/kdc_base_test.py
+++ b/python/samba/tests/krb5/kdc_base_test.py
@@ -777,8 +777,9 @@ class KDCBaseTest(TestCaseInTempDir, RawKerberosTest):
             samdb.add(details)
         except ldb.LdbError as err:
             num, estr = err.args
+            if num != ldb.ERR_ENTRY_ALREADY_EXISTS:
+                raise
             self.assertFalse(force, 'should not fail with force=True')
-            self.assertEqual(num, ldb.ERR_ENTRY_ALREADY_EXISTS)
         else:
             # Save the claim DN so it can be deleted in tearDownClass()
             self.accounts.append(str(claim_dn))