sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

dcerpc/misc tests: asset GUID ordering in python 2 and 3

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall
2017-03-10 15:48:38 +13:00
committed by Andrew Bartlett
parent 9843ccef87
commit e481aed28d
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
python/samba/tests/dcerpc/misc.py
View File

@ -24,6 +24,13 @@ from samba.compat import PY3
text1 = "76f53846-a7c2-476a-ae2c-20e2b80d7b34"
text2 = "344edffa-330a-4b39-b96e-2c34da52e8b1"
if not PY3:
# cmp() exists only in Python 2
def cmp(a, b):
return (a > b) - (a < b)
class GUIDTests(samba.tests.TestCase):
def test_str(self):
@ -38,8 +45,7 @@ class GUIDTests(samba.tests.TestCase):
guid1 = misc.GUID(text1)
guid2 = misc.GUID(text2)
self.assertFalse(guid1 == guid2)
if not PY3:
# cmp() exists only in Python 2
self.assertGreater(guid1, guid2)
self.assertTrue(cmp(guid1, guid2) > 0)
def test_compare_same(self):
@ -47,8 +53,6 @@ class GUIDTests(samba.tests.TestCase):
guid2 = misc.GUID(text1)
self.assertTrue(guid1 == guid2)
self.assertEquals(guid1, guid2)
if not PY3:
# cmp() exists only in Python 2
self.assertEquals(0, cmp(guid1, guid2))
@ -66,4 +70,3 @@ class PolicyHandleTests(samba.tests.TestCase):
def test_str(self):
x = misc.policy_handle(text1, 42)
self.assertEquals("%d, %s" % (42, text1), str(x))