s4/dsdb/tests: PY3 port samba4.user_account_control test

Fix dict_items are not combinable with '+' operator error, need
to convert to list first.

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/dsdb/tests/python/user_account_control.py b/source4/dsdb/tests/python/user_account_control.py
index fc5a962b3d977c364c99e84f2c37144af61f2f81..a64fc629c0101a4c967ba50a79063f3a5a68b566 100755 (executable)
--- a/source4/dsdb/tests/python/user_account_control.py
+++ b/source4/dsdb/tests/python/user_account_control.py
@@ -98,7 +98,7 @@ class UserAccountControlTests(samba.tests.TestCase):
             "dn": dn,
             "objectclass": "computer"}
         if others is not None:
-            msg_dict = dict(msg_dict.items() + others.items())
+            msg_dict = dict(list(msg_dict.items()) + list(others.items()))
 
         msg = ldb.Message.from_dict(self.samdb, msg_dict)
         msg["sAMAccountName"] = samaccountname