@@ -429,54 +429,52 @@ def mock_popen(cmd):
429
429
)
430
430
self .assertEqual (mac , 0x1234567890ab )
431
431
432
- def check_node (self , node , requires = None , network = False ):
432
+ def check_node (self , node , requires = None ):
433
433
if requires and node is None :
434
434
self .skipTest ('requires ' + requires )
435
435
hex = '%012x' % node
436
436
if test_support .verbose >= 2 :
437
437
print hex + ' ' ,
438
- if network :
439
- # 47 bit will never be set in IEEE 802 addresses obtained
440
- # from network cards.
441
- self .assertFalse (node & 0x010000000000 , hex )
442
438
self .assertTrue (0 < node < (1L << 48 ),
443
439
"%s is not an RFC 4122 node ID" % hex )
444
440
445
441
@unittest .skipUnless (os .name == 'posix' , 'requires Posix' )
446
442
def test_ifconfig_getnode (self ):
447
443
node = uuid ._ifconfig_getnode ()
448
- self .check_node (node , 'ifconfig' , True )
444
+ self .check_node (node , 'ifconfig' )
449
445
450
446
@unittest .skipUnless (os .name == 'posix' , 'requires Posix' )
451
447
def test_arp_getnode (self ):
452
448
node = uuid ._arp_getnode ()
453
- self .check_node (node , 'arp' , True )
449
+ self .check_node (node , 'arp' )
454
450
455
451
@unittest .skipUnless (os .name == 'posix' , 'requires Posix' )
456
452
def test_lanscan_getnode (self ):
457
453
node = uuid ._lanscan_getnode ()
458
- self .check_node (node , 'lanscan' , True )
454
+ self .check_node (node , 'lanscan' )
459
455
460
456
@unittest .skipUnless (os .name == 'posix' , 'requires Posix' )
461
457
def test_netstat_getnode (self ):
462
458
node = uuid ._netstat_getnode ()
463
- self .check_node (node , 'netstat' , True )
459
+ self .check_node (node , 'netstat' )
464
460
465
461
@unittest .skipUnless (os .name == 'nt' , 'requires Windows' )
466
462
def test_ipconfig_getnode (self ):
467
463
node = uuid ._ipconfig_getnode ()
468
- self .check_node (node , 'ipconfig' , True )
464
+ self .check_node (node , 'ipconfig' )
469
465
470
466
@unittest .skipUnless (importable ('win32wnet' ), 'requires win32wnet' )
471
467
@unittest .skipUnless (importable ('netbios' ), 'requires netbios' )
472
468
def test_netbios_getnode (self ):
473
469
node = uuid ._netbios_getnode ()
474
- self .check_node (node , network = True )
470
+ self .check_node (node )
475
471
476
472
def test_random_getnode (self ):
477
473
node = uuid ._random_getnode ()
478
- # Least significant bit of first octet must be set.
479
- self .assertTrue (node & 0x010000000000 , '%012x' % node )
474
+ # The multicast bit, i.e. the least significant bit of first octet,
475
+ # must be set for randomly generated MAC addresses. See RFC 4122,
476
+ # $4.1.6.
477
+ self .assertTrue (node & (1 << 40 ), '%012x' % node )
480
478
self .check_node (node )
481
479
482
480
@unittest .skipUnless (os .name == 'posix' , 'requires Posix' )
0 commit comments