From: Douglas Bagnall Date: Fri, 16 Mar 2018 03:33:44 +0000 (+1300) Subject: tests/dcerpc/misc.GUID: test that long-form py3 bytes works X-Git-Tag: talloc-2.1.13~253 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f6db12e236d3774b14e0af14889b0709cab3af0b;p=thirdparty%2Fsamba.git tests/dcerpc/misc.GUID: test that long-form py3 bytes works Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/dcerpc/misc.py b/python/samba/tests/dcerpc/misc.py index a66f6c25bd0..cf3dcbf3bb4 100644 --- a/python/samba/tests/dcerpc/misc.py +++ b/python/samba/tests/dcerpc/misc.py @@ -24,7 +24,8 @@ from samba.compat import PY3 text1 = "76f53846-a7c2-476a-ae2c-20e2b80d7b34" text2 = "344edffa-330a-4b39-b96e-2c34da52e8b1" text3_s = "00112233-4455-6677-8899-aabbccddeeff" -text3_b = b"\x33\x22\x11\x00\x55\x44\x77\x66\x88\x99\xaa\xbb\xcc\xdd\xee\xff" +text3_b = b"00112233-4455-6677-8899-aabbccddeeff" +text3_b16 = b"\x33\x22\x11\x00\x55\x44\x77\x66\x88\x99\xaa\xbb\xcc\xdd\xee\xff" text3_h = "33221100554477668899aabbccddeeff" @@ -58,10 +59,14 @@ class GUIDTests(samba.tests.TestCase): self.assertEquals(guid1, guid2) self.assertEquals(0, cmp(guid1, guid2)) - def test_binary_format(self): + def test_bytes_equals_string(self): guid = misc.GUID(text3_b) self.assertEquals(text3_s, str(guid)) + def test_binary_format(self): + guid = misc.GUID(text3_b16) + self.assertEquals(text3_s, str(guid)) + def test_strhex_format(self): guid = misc.GUID(text3_h) self.assertEquals(text3_s, str(guid))