1. The assumptions in check_node() were too restrictive: - Hardware addresses with universal_local_bit=1 are valid (locally administered). - Many of the tested functions (including uuid.getnode()) may return valid RFC 4122 random node IDs. These are pretty much random 48-bit values with the multicast bit set to 1. 2. _unixdll_getnode() calls _uuid_generate_time(), which may be None on some platforms. The resulting TypeError is now caught.
This commit is contained in:
parent
6d7dfa231f
commit
a185839862
|
@ -281,14 +281,8 @@ class TestUUID(TestCase):
|
|||
badtype(lambda: setattr(u, 'node', 0))
|
||||
|
||||
def check_node(self, node, source):
|
||||
individual_group_bit = (node >> 40L) & 1
|
||||
universal_local_bit = (node >> 40L) & 2
|
||||
message = "%012x doesn't look like a real MAC address" % node
|
||||
self.assertEqual(individual_group_bit, 0, message)
|
||||
self.assertEqual(universal_local_bit, 0, message)
|
||||
self.assertNotEqual(node, 0, message)
|
||||
self.assertNotEqual(node, 0xffffffffffffL, message)
|
||||
self.assertTrue(0 <= node, message)
|
||||
message = "%012x is not an RFC 4122 node ID" % node
|
||||
self.assertTrue(0 < node, message)
|
||||
self.assertTrue(node < (1L << 48), message)
|
||||
|
||||
TestUUID.source2node[source] = node
|
||||
|
@ -307,11 +301,6 @@ class TestUUID(TestCase):
|
|||
|
||||
def test_ifconfig_getnode(self):
|
||||
import sys
|
||||
print >>sys.__stdout__, \
|
||||
""" WARNING: uuid._ifconfig_getnode is unreliable on many platforms.
|
||||
It is disabled until the code and/or test can be fixed properly."""
|
||||
return
|
||||
|
||||
import os
|
||||
if os.name == 'posix':
|
||||
node = uuid._ifconfig_getnode()
|
||||
|
@ -331,19 +320,18 @@ class TestUUID(TestCase):
|
|||
|
||||
def test_random_getnode(self):
|
||||
node = uuid._random_getnode()
|
||||
self.assertTrue(0 <= node)
|
||||
self.assertTrue(node < (1L <<48))
|
||||
# Least significant bit of first octet must be set.
|
||||
self.assertTrue(node & 0x010000000000)
|
||||
self.assertTrue(node < (1L << 48))
|
||||
|
||||
def test_unixdll_getnode(self):
|
||||
import sys
|
||||
print >>sys.__stdout__, \
|
||||
""" WARNING: uuid._unixdll_getnode is unreliable on many platforms.
|
||||
It is disabled until the code and/or test can be fixed properly."""
|
||||
return
|
||||
|
||||
import os
|
||||
if importable('ctypes') and os.name == 'posix':
|
||||
self.check_node(uuid._unixdll_getnode(), 'unixdll')
|
||||
try: # Issues 1481, 3581: _uuid_generate_time() might be None.
|
||||
self.check_node(uuid._unixdll_getnode(), 'unixdll')
|
||||
except TypeError:
|
||||
pass
|
||||
|
||||
def test_windll_getnode(self):
|
||||
import os
|
||||
|
@ -352,11 +340,6 @@ class TestUUID(TestCase):
|
|||
|
||||
def test_getnode(self):
|
||||
import sys
|
||||
print >>sys.__stdout__, \
|
||||
""" WARNING: uuid.getnode is unreliable on many platforms.
|
||||
It is disabled until the code and/or test can be fixed properly."""
|
||||
return
|
||||
|
||||
node1 = uuid.getnode()
|
||||
self.check_node(node1, "getnode1")
|
||||
|
||||
|
|
Loading…
Reference in New Issue