From: Joe Guo <joeg@catalyst.net.nz>
Date: Tue, 10 Apr 2018 23:39:56 +0000 (+1200)
Subject: selftest: enable py3 for samba.tests.dcerpc.bare
X-Git-Tag: ldb-1.4.0~598
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e209cc2ee2f0dae5733e58b681eb27ab9bb3beae;p=thirdparty%2Fsamba.git

selftest: enable py3 for samba.tests.dcerpc.bare

Prefix b to bytes.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
---

diff --git a/python/samba/tests/dcerpc/bare.py b/python/samba/tests/dcerpc/bare.py
index 270c7af382e..380164cff10 100644
--- a/python/samba/tests/dcerpc/bare.py
+++ b/python/samba/tests/dcerpc/bare.py
@@ -30,7 +30,7 @@ class BareTestCase(samba.tests.TestCase):
         x = ClientConnection("ncalrpc:localhost[DEFAULT]",
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
                 lp_ctx=samba.tests.env_loadparm())
-        self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
+        self.assertEquals(b"\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
     def test_two_contexts(self):
         x = ClientConnection("ncalrpc:localhost[DEFAULT]",
@@ -40,14 +40,14 @@ class BareTestCase(samba.tests.TestCase):
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
                 basis_connection=x, lp_ctx=samba.tests.env_loadparm())
         self.assertEquals(24, len(x.request(0, chr(0) * 8)))
-        self.assertEquals("\x01\x00\x00\x00", y.request(0, chr(0) * 4))
+        self.assertEquals(b"\x01\x00\x00\x00", y.request(0, chr(0) * 4))
 
     def test_bare_tcp(self):
         # Connect to the echo pipe
         x = ClientConnection("ncacn_ip_tcp:%s" % os.environ["SERVER"],
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
                 lp_ctx=samba.tests.env_loadparm())
-        self.assertEquals("\x01\x00\x00\x00", x.request(0, chr(0) * 4))
+        self.assertEquals(b"\x01\x00\x00\x00", x.request(0, chr(0) * 4))
 
     def test_two_contexts_tcp(self):
         x = ClientConnection("ncacn_ip_tcp:%s" % os.environ["SERVER"],
@@ -57,4 +57,4 @@ class BareTestCase(samba.tests.TestCase):
                 ("60a15ec5-4de8-11d7-a637-005056a20182", 1),
                 basis_connection=x, lp_ctx=samba.tests.env_loadparm())
         self.assertEquals(24, len(x.request(0, chr(0) * 8)))
-        self.assertEquals("\x01\x00\x00\x00", y.request(0, chr(0) * 4))
+        self.assertEquals(b"\x01\x00\x00\x00", y.request(0, chr(0) * 4))
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 47ff7f24653..95058b1ea2c 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -579,7 +579,7 @@ planoldpythontestsuite("none", "simple", extra_path=["%s/lib/tdb/python/tests" %
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.sam", py3_compatible=True)
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dsdb", py3_compatible=True)
 planpythontestsuite("none", "samba.tests.dsdb_lock")
-planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.bare")
+planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.bare", py3_compatible=True)
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.unix")
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.dcerpc.srvsvc")
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.samba_tool.timecmd")