sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00
Code Activity

dsdb python tests: convert 'except X, (tuple)' to 'except X as e'

Browse Source 
In addition to converting the except line another line is also added
for each except to extract the tuple contents.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power
2018-02-23 14:34:23 +00:00
committed by Douglas Bagnall
parent 9f61bf115e
commit 0c31d38794
19 changed files with 904 additions and 452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source4/dsdb/tests/python/user_account_control.py
View File

@ -227,7 +227,8 @@ class UserAccountControlTests(samba.tests.TestCase):
try:
self.samdb.modify(m)
self.fail("Unexpectedly able to set userAccountControl to be a DC on %s" % m.dn)
except LdbError, (enum, estr):
except LdbError as e5:
(enum, estr) = e5.args
self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
m = ldb.Message()
@ -237,7 +238,8 @@ class UserAccountControlTests(samba.tests.TestCase):
try:
self.samdb.modify(m)
self.fail("Unexpectedly able to set userAccountControl to be an RODC on %s" % m.dn)
except LdbError, (enum, estr):
except LdbError as e6:
(enum, estr) = e6.args
self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
m = ldb.Message()
@ -247,7 +249,8 @@ class UserAccountControlTests(samba.tests.TestCase):
try:
self.samdb.modify(m)
self.fail("Unexpectedly able to set userAccountControl to be an Workstation on %s" % m.dn)
except LdbError, (enum, estr):
except LdbError as e7:
(enum, estr) = e7.args
self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
m = ldb.Message()
@ -262,7 +265,8 @@ class UserAccountControlTests(samba.tests.TestCase):
ldb.FLAG_MOD_REPLACE, "primaryGroupID")
try:
self.samdb.modify(m)
except LdbError, (enum, estr):
except LdbError as e8:
(enum, estr) = e8.args
self.assertEqual(ldb.ERR_UNWILLING_TO_PERFORM, enum)
return
self.fail()
@ -297,7 +301,8 @@ class UserAccountControlTests(samba.tests.TestCase):
try:
self.samdb.modify(m)
self.fail("Unexpectedly able to set userAccountControl on %s" % m.dn)
except LdbError, (enum, estr):
except LdbError as e9:
(enum, estr) = e9.args
self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
m = ldb.Message()
@ -307,7 +312,8 @@ class UserAccountControlTests(samba.tests.TestCase):
try:
self.samdb.modify(m)
self.fail()
except LdbError, (enum, estr):
except LdbError as e10:
(enum, estr) = e10.args
self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
m = ldb.Message()
@ -323,7 +329,8 @@ class UserAccountControlTests(samba.tests.TestCase):
try:
self.samdb.modify(m)
self.fail("Unexpectedly able to set userAccountControl to be an Workstation on %s" % m.dn)
except LdbError, (enum, estr):
except LdbError as e11:
(enum, estr) = e11.args
self.assertEqual(ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS, enum)
@ -345,7 +352,8 @@ class UserAccountControlTests(samba.tests.TestCase):
try:
self.admin_samdb.modify(m)
self.fail("Unexpectedly able to set userAccountControl to UF_WORKSTATION_TRUST_ACCOUNT|UF_PARTIAL_SECRETS_ACCOUNT|UF_TRUSTED_FOR_DELEGATION on %s" % m.dn)
except LdbError, (enum, estr):
except LdbError as e12:
(enum, estr) = e12.args
self.assertEqual(ldb.ERR_OTHER, enum)
m = ldb.Message()
@ -417,7 +425,8 @@ class UserAccountControlTests(samba.tests.TestCase):
self.samdb.modify(m)
if (bit in priv_bits):
self.fail("Unexpectedly able to set userAccountControl bit 0x%08X on %s" % (bit, m.dn))
except LdbError, (enum, estr):
except LdbError as e:
(enum, estr) = e.args
if bit in invalid_bits:
self.assertEqual(enum, ldb.ERR_OTHER, "was not able to set 0x%08X on %s" % (bit, m.dn))
# No point going on, try the next bit
@ -492,7 +501,8 @@ class UserAccountControlTests(samba.tests.TestCase):
if bit in invalid_bits:
self.fail("Should have been unable to set userAccountControl bit 0x%08X on %s" % (bit, m.dn))
except LdbError, (enum, estr):
except LdbError as e1:
(enum, estr) = e1.args
if bit in invalid_bits:
self.assertEqual(enum, ldb.ERR_OTHER)
# No point going on, try the next bit
@ -524,7 +534,8 @@ class UserAccountControlTests(samba.tests.TestCase):
ldb.FLAG_MOD_REPLACE, "userAccountControl")
self.samdb.modify(m)
except LdbError, (enum, estr):
except LdbError as e2:
(enum, estr) = e2.args
self.fail("Unable to set userAccountControl bit 0x%08X on %s: %s" % (bit, m.dn, estr))
res = self.admin_samdb.search("%s" % self.base_dn,
@ -561,7 +572,8 @@ class UserAccountControlTests(samba.tests.TestCase):
if bit in priv_to_remove_bits:
self.fail("Should have been unable to remove userAccountControl bit 0x%08X on %s" % (bit, m.dn))
except LdbError, (enum, estr):
except LdbError as e3:
(enum, estr) = e3.args
if bit in priv_to_remove_bits:
self.assertEqual(enum, ldb.ERR_INSUFFICIENT_ACCESS_RIGHTS)
else:
@ -618,7 +630,8 @@ class UserAccountControlTests(samba.tests.TestCase):
if bit in priv_bits:
self.fail("Unexpectdly able to set userAccountControl bit 0x%08X on %s" % (bit, computername))
except LdbError, (enum, estr):
except LdbError as e4:
(enum, estr) = e4.args
if bit in invalid_bits:
self.assertEqual(enum, ldb.ERR_OTHER, "Invalid bit 0x%08X was able to be set on %s" % (bit, computername))
# No point going on, try the next bit
@ -642,7 +655,8 @@ class UserAccountControlTests(samba.tests.TestCase):
# When creating a new object, you can not ever set the primaryGroupID
self.add_computer_ldap(computername, others={"primaryGroupID": [str(security.DOMAIN_RID_ADMINS)]})
self.fail("Unexpectedly able to set primaryGruopID to be an admin on %s" % computername)
except LdbError, (enum, estr):
except LdbError as e13:
(enum, estr) = e13.args
self.assertEqual(enum, ldb.ERR_UNWILLING_TO_PERFORM)
@ -676,7 +690,8 @@ class UserAccountControlTests(samba.tests.TestCase):
# When creating a new object, you can not ever set the primaryGroupID
self.fail("Unexpectedly able to set primaryGroupID to be other than DCS on %s" % computername)
except LdbError, (enum, estr):
except LdbError as e14:
(enum, estr) = e14.args
self.assertEqual(enum, ldb.ERR_UNWILLING_TO_PERFORM)
def test_primarygroupID_priv_member_modify(self):
@ -709,7 +724,8 @@ class UserAccountControlTests(samba.tests.TestCase):
# When creating a new object, you can not ever set the primaryGroupID
self.fail("Unexpectedly able to set primaryGroupID to be other than DCS on %s" % computername)
except LdbError, (enum, estr):
except LdbError as e15:
(enum, estr) = e15.args
self.assertEqual(enum, ldb.ERR_UNWILLING_TO_PERFORM)