cpython: 6ceb5bf24da8 (original) (raw)

--- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -1,5 +1,6 @@ -from unittest import TestCase +import unittest from test import test_support +import os import uuid def importable(name): @@ -9,7 +10,7 @@ def importable(name): except: return False -class TestUUID(TestCase): +class TestUUID(unittest.TestCase): last_node = None source2node = {} @@ -299,24 +300,22 @@ class TestUUID(TestCase): else: TestUUID.last_node = node

@unittest.skipUnless(os.name == 'posix', 'requires Posix') def test_ifconfig_getnode(self):

```
   import sys[](#l1.26)
```
```
   import os[](#l1.27)
```
```
   if os.name == 'posix':[](#l1.28)
```

       node = uuid._ifconfig_getnode()[](#l1.29)

```
       if node is not None:[](#l1.30)
```

           self.check_node(node, 'ifconfig')[](#l1.31)

   node = uuid._ifconfig_getnode()[](#l1.32)

```
   if node is not None:[](#l1.33)
```

       self.check_node(node, 'ifconfig')[](#l1.34)

@unittest.skipUnless(os.name == 'nt', 'requires Windows') def test_ipconfig_getnode(self):

```
   import os[](#l1.38)
```
```
   if os.name == 'nt':[](#l1.39)
```

       node = uuid._ipconfig_getnode()[](#l1.40)

```
       if node is not None:[](#l1.41)
```

           self.check_node(node, 'ipconfig')[](#l1.42)

   node = uuid._ipconfig_getnode()[](#l1.43)

```
   if node is not None:[](#l1.44)
```

       self.check_node(node, 'ipconfig')[](#l1.45)

@unittest.skipUnless(importable('win32wnet'), 'requires win32wnet')
@unittest.skipUnless(importable('netbios'), 'requires netbios') def test_netbios_getnode(self):

   if importable('win32wnet') and importable('netbios'):[](#l1.50)

       self.check_node(uuid._netbios_getnode(), 'netbios')[](#l1.51)

   self.check_node(uuid._netbios_getnode(), 'netbios')[](#l1.52)

def test_random_getnode(self): node = uuid._random_getnode() @@ -324,22 +323,20 @@ class TestUUID(TestCase): self.assertTrue(node & 0x010000000000) self.assertTrue(node < (1L << 48))

@unittest.skipUnless(os.name == 'posix', 'requires Posix')
@unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_unixdll_getnode(self):

```
   import sys[](#l1.63)
```
```
   import os[](#l1.64)
```

   if importable('ctypes') and os.name == 'posix':[](#l1.65)

       try: # Issues 1481, 3581: _uuid_generate_time() might be None.[](#l1.66)

           self.check_node(uuid._unixdll_getnode(), 'unixdll')[](#l1.67)

```
       except TypeError:[](#l1.68)
```
```
           pass[](#l1.69)
```

   try: # Issues 1481, 3581: _uuid_generate_time() might be None.[](#l1.70)

       self.check_node(uuid._unixdll_getnode(), 'unixdll')[](#l1.71)

```
   except TypeError:[](#l1.72)
```
```
       pass[](#l1.73)
```

@unittest.skipUnless(os.name == 'nt', 'requires Windows')
@unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_windll_getnode(self):

```
   import os[](#l1.78)
```

   if importable('ctypes') and os.name == 'nt':[](#l1.79)

       self.check_node(uuid._windll_getnode(), 'windll')[](#l1.80)

   self.check_node(uuid._windll_getnode(), 'windll')[](#l1.81)

def test_getnode(self):

   import sys[](#l1.84)
   node1 = uuid.getnode()[](#l1.85)
   self.check_node(node1, "getnode1")[](#l1.86)

@@ -349,13 +346,8 @@ class TestUUID(TestCase): self.assertEqual(node1, node2)

@unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_uuid1(self):

```
   # uuid1 requires ctypes.[](#l1.94)
```
```
   try:[](#l1.95)
```
```
       import ctypes[](#l1.96)
```
```
   except ImportError:[](#l1.97)
```
```
       return[](#l1.98)
```

- equal = self.assertEqual # Make sure uuid1() generates UUIDs that are actually version 1. @@ -408,13 +400,8 @@ class TestUUID(TestCase): equal(u, uuid.UUID(v)) equal(str(u), v)

@unittest.skipUnless(importable('ctypes'), 'requires ctypes') def test_uuid4(self):

```
   # uuid4 requires ctypes.[](#l1.109)
```
```
   try:[](#l1.110)
```
```
       import ctypes[](#l1.111)
```
```
   except ImportError:[](#l1.112)
```
```
       return[](#l1.113)
```

- equal = self.assertEqual # Make sure uuid4() generates UUIDs that are actually version 4. @@ -446,12 +433,8 @@ class TestUUID(TestCase): equal(u, uuid.UUID(v)) equal(str(u), v)

@unittest.skipUnless(os.name == 'posix', 'requires Posix') def testIssue8621(self):

```
   import os[](#l1.124)
```
```
   import sys[](#l1.125)
```
```
   if os.name != 'posix':[](#l1.126)
```
```
       return[](#l1.127)
```

- # On at least some versions of OSX uuid.uuid4 generates # the same sequence of UUIDs in the parent and any # children started using fork.

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -58,6 +58,8 @@ IDLE Tests ----- +- Issue #18094: test_uuid no more reports skipped tests as passed. +

Issue #11995: test_pydoc doesn't import all sys.path modules anymore. Documentation