From 49c8c130a0d08be7c869b9a63b5a37488003eac2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Thu, 13 May 2010 22:35:06 +0200 Subject: [PATCH] s4:domainlevel - handle exceptions more precisely LDB_ERR_UNWILLING_TO_PERFORM should be the right error code when the "msDS-Behavior-Version" was already raised by the first change as it is on Windows Server. When s4 itself does implement this trigger then we don't need to do the second write operation anymore (they're kept in sync). --- source4/scripting/python/samba/netcmd/domainlevel.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source4/scripting/python/samba/netcmd/domainlevel.py b/source4/scripting/python/samba/netcmd/domainlevel.py index 310747a3dee..72559bb924e 100644 --- a/source4/scripting/python/samba/netcmd/domainlevel.py +++ b/source4/scripting/python/samba/netcmd/domainlevel.py @@ -200,7 +200,7 @@ class cmd_domainlevel(Command): try: samdb.modify(m) except LdbError, (num, _): - pass + self.assertEquals(num, ldb.ERR_UNWILLING_TO_PERFORM) # Directly on the base DN m = ldb.Message() @@ -219,7 +219,7 @@ class cmd_domainlevel(Command): try: samdb.modify(m) except LdbError, (num, _): - pass + self.assertEquals(num, ldb.ERR_UNWILLING_TO_PERFORM) level_domain = new_level_domain msgs.append("Domain function level changed!") -- 2.11.4.GIT