mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-28 19:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[3.6] bpo-32107 - Backport bitmask check fix (GH-4576) (#4591)

Browse source 
Remove a flakey test and rewrite another one for readability.
This commit is contained in:
Barry Warsaw 2017-11-29 10:35:02 -05:00 • committed by GitHub
parent b0df786258
commit 23cc8c0f9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/test/test_uuid.py
View file

@ -438,59 +438,57 @@ eth0 Link encap:Ethernet HWaddr 12:34:56:78:90:ab
self.assertEqual(mac, 0x1234567890ab) self.assertEqual(mac, 0x1234567890ab)
def check_node(self, node, requires=None, network=False): def check_node(self, node, requires=None):
if requires and node is None: if requires and node is None:
self.skipTest('requires ' + requires) self.skipTest('requires ' + requires)
hex = '%012x' % node hex = '%012x' % node
if support.verbose >= 2: if support.verbose >= 2:
print(hex, end=' ') print(hex, end=' ')
if network:
# 47 bit will never be set in IEEE 802 addresses obtained
# from network cards.
self.assertFalse(node & 0x010000000000, hex)
self.assertTrue(0 < node < (1 << 48), self.assertTrue(0 < node < (1 << 48),
"%s is not an RFC 4122 node ID" % hex) "%s is not an RFC 4122 node ID" % hex)
@unittest.skipUnless(os.name == 'posix', 'requires Posix') @unittest.skipUnless(os.name == 'posix', 'requires Posix')
def test_ifconfig_getnode(self): def test_ifconfig_getnode(self):
node = uuid._ifconfig_getnode() node = uuid._ifconfig_getnode()
self.check_node(node, 'ifconfig', True) self.check_node(node, 'ifconfig')
@unittest.skipUnless(os.name == 'posix', 'requires Posix') @unittest.skipUnless(os.name == 'posix', 'requires Posix')
def test_ip_getnode(self): def test_ip_getnode(self):
node = uuid._ip_getnode() node = uuid._ip_getnode()
self.check_node(node, 'ip', True) self.check_node(node, 'ip')
@unittest.skipUnless(os.name == 'posix', 'requires Posix') @unittest.skipUnless(os.name == 'posix', 'requires Posix')
def test_arp_getnode(self): def test_arp_getnode(self):
node = uuid._arp_getnode() node = uuid._arp_getnode()
self.check_node(node, 'arp', True) self.check_node(node, 'arp')
@unittest.skipUnless(os.name == 'posix', 'requires Posix') @unittest.skipUnless(os.name == 'posix', 'requires Posix')
def test_lanscan_getnode(self): def test_lanscan_getnode(self):
node = uuid._lanscan_getnode() node = uuid._lanscan_getnode()
self.check_node(node, 'lanscan', True) self.check_node(node, 'lanscan')
@unittest.skipUnless(os.name == 'posix', 'requires Posix') @unittest.skipUnless(os.name == 'posix', 'requires Posix')
def test_netstat_getnode(self): def test_netstat_getnode(self):
node = uuid._netstat_getnode() node = uuid._netstat_getnode()
self.check_node(node, 'netstat', True) self.check_node(node, 'netstat')
@unittest.skipUnless(os.name == 'nt', 'requires Windows') @unittest.skipUnless(os.name == 'nt', 'requires Windows')
def test_ipconfig_getnode(self): def test_ipconfig_getnode(self):
node = uuid._ipconfig_getnode() node = uuid._ipconfig_getnode()
self.check_node(node, 'ipconfig', True) self.check_node(node, 'ipconfig')
@unittest.skipUnless(importable('win32wnet'), 'requires win32wnet') @unittest.skipUnless(importable('win32wnet'), 'requires win32wnet')
@unittest.skipUnless(importable('netbios'), 'requires netbios') @unittest.skipUnless(importable('netbios'), 'requires netbios')
def test_netbios_getnode(self): def test_netbios_getnode(self):
node = uuid._netbios_getnode() node = uuid._netbios_getnode()
self.check_node(node, network=True) self.check_node(node)
def test_random_getnode(self): def test_random_getnode(self):
node = uuid._random_getnode() node = uuid._random_getnode()
# Least significant bit of first octet must be set. # The multicast bit, i.e. the least significant bit of first octet,
self.assertTrue(node & 0x010000000000, '%012x' % node) # must be set for randomly generated MAC addresses. See RFC 4122,
# $4.1.6.
self.assertTrue(node & (1 << 40), '%012x' % node)
self.check_node(node) self.check_node(node)
@unittest.skipUnless(os.name == 'posix', 'requires Posix') @unittest.skipUnless(os.name == 'posix', 'requires Posix')