Signed-off-by: Lumir Balhar <lbalhar@redhat.com>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Mon Oct 23 15:40:48 CEST 2017 on sn-devel-144
import sys
PY3 = sys.version_info[0] == 3
import sys
PY3 = sys.version_info[0] == 3
+
+if PY3:
+ integer_types = int,
+else:
+ integer_types = (int, long)
from samba.dcerpc import server_id
import random
import os
from samba.dcerpc import server_id
import random
import os
+from samba.compat import integer_types
+
class MessagingTests(TestCase):
class MessagingTests(TestCase):
def callback():
pass
msg_type = x.register((callback, None))
def callback():
pass
msg_type = x.register((callback, None))
- self.assertTrue(isinstance(msg_type, long))
+ self.assertTrue(isinstance(msg_type, integer_types))
x.deregister(callback, msg_type)
def test_all_servers(self):
x.deregister(callback, msg_type)
def test_all_servers(self):
planpythontestsuite("none", "samba.tests.dcerpc.array")
planpythontestsuite("none", "samba.tests.dcerpc.string")
planpythontestsuite("none", "samba.tests.hostconfig")
planpythontestsuite("none", "samba.tests.dcerpc.array")
planpythontestsuite("none", "samba.tests.dcerpc.string")
planpythontestsuite("none", "samba.tests.hostconfig")
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.messaging")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.messaging",
+ py3_compatible=True)
planpythontestsuite("none", "samba.tests.samba3sam")
planpythontestsuite(
"none", "wafsamba.tests.test_suite",
planpythontestsuite("none", "samba.tests.samba3sam")
planpythontestsuite(
"none", "wafsamba.tests.test_suite",