Commit 95787fdb authored by Serhiy Storchaka's avatar Serhiy Storchaka

Issue #18094: test_uuid no more reports skipped tests as passed.

parent b02a1b8a
from unittest import TestCase import unittest
from test import test_support from test import test_support
import os
import uuid import uuid
def importable(name): def importable(name):
...@@ -9,7 +10,7 @@ def importable(name): ...@@ -9,7 +10,7 @@ def importable(name):
except: except:
return False return False
class TestUUID(TestCase): class TestUUID(unittest.TestCase):
last_node = None last_node = None
source2node = {} source2node = {}
...@@ -299,23 +300,21 @@ class TestUUID(TestCase): ...@@ -299,23 +300,21 @@ class TestUUID(TestCase):
else: else:
TestUUID.last_node = node TestUUID.last_node = node
@unittest.skipUnless(os.name == 'posix', 'requires Posix')
def test_ifconfig_getnode(self): def test_ifconfig_getnode(self):
import sys
import os
if os.name == 'posix':
node = uuid._ifconfig_getnode() node = uuid._ifconfig_getnode()
if node is not None: if node is not None:
self.check_node(node, 'ifconfig') self.check_node(node, 'ifconfig')
@unittest.skipUnless(os.name == 'nt', 'requires Windows')
def test_ipconfig_getnode(self): def test_ipconfig_getnode(self):
import os
if os.name == 'nt':
node = uuid._ipconfig_getnode() node = uuid._ipconfig_getnode()
if node is not None: if node is not None:
self.check_node(node, 'ipconfig') self.check_node(node, 'ipconfig')
@unittest.skipUnless(importable('win32wnet'), 'requires win32wnet')
@unittest.skipUnless(importable('netbios'), 'requires netbios')
def test_netbios_getnode(self): def test_netbios_getnode(self):
if importable('win32wnet') and importable('netbios'):
self.check_node(uuid._netbios_getnode(), 'netbios') self.check_node(uuid._netbios_getnode(), 'netbios')
def test_random_getnode(self): def test_random_getnode(self):
...@@ -324,22 +323,20 @@ class TestUUID(TestCase): ...@@ -324,22 +323,20 @@ class TestUUID(TestCase):
self.assertTrue(node & 0x010000000000) self.assertTrue(node & 0x010000000000)
self.assertTrue(node < (1L << 48)) self.assertTrue(node < (1L << 48))
@unittest.skipUnless(os.name == 'posix', 'requires Posix')
@unittest.skipUnless(importable('ctypes'), 'requires ctypes')
def test_unixdll_getnode(self): def test_unixdll_getnode(self):
import sys
import os
if importable('ctypes') and os.name == 'posix':
try: # Issues 1481, 3581: _uuid_generate_time() might be None. try: # Issues 1481, 3581: _uuid_generate_time() might be None.
self.check_node(uuid._unixdll_getnode(), 'unixdll') self.check_node(uuid._unixdll_getnode(), 'unixdll')
except TypeError: except TypeError:
pass pass
@unittest.skipUnless(os.name == 'nt', 'requires Windows')
@unittest.skipUnless(importable('ctypes'), 'requires ctypes')
def test_windll_getnode(self): def test_windll_getnode(self):
import os
if importable('ctypes') and os.name == 'nt':
self.check_node(uuid._windll_getnode(), 'windll') self.check_node(uuid._windll_getnode(), 'windll')
def test_getnode(self): def test_getnode(self):
import sys
node1 = uuid.getnode() node1 = uuid.getnode()
self.check_node(node1, "getnode1") self.check_node(node1, "getnode1")
...@@ -349,13 +346,8 @@ class TestUUID(TestCase): ...@@ -349,13 +346,8 @@ class TestUUID(TestCase):
self.assertEqual(node1, node2) self.assertEqual(node1, node2)
@unittest.skipUnless(importable('ctypes'), 'requires ctypes')
def test_uuid1(self): def test_uuid1(self):
# uuid1 requires ctypes.
try:
import ctypes
except ImportError:
return
equal = self.assertEqual equal = self.assertEqual
# Make sure uuid1() generates UUIDs that are actually version 1. # Make sure uuid1() generates UUIDs that are actually version 1.
...@@ -408,13 +400,8 @@ class TestUUID(TestCase): ...@@ -408,13 +400,8 @@ class TestUUID(TestCase):
equal(u, uuid.UUID(v)) equal(u, uuid.UUID(v))
equal(str(u), v) equal(str(u), v)
@unittest.skipUnless(importable('ctypes'), 'requires ctypes')
def test_uuid4(self): def test_uuid4(self):
# uuid4 requires ctypes.
try:
import ctypes
except ImportError:
return
equal = self.assertEqual equal = self.assertEqual
# Make sure uuid4() generates UUIDs that are actually version 4. # Make sure uuid4() generates UUIDs that are actually version 4.
...@@ -446,12 +433,8 @@ class TestUUID(TestCase): ...@@ -446,12 +433,8 @@ class TestUUID(TestCase):
equal(u, uuid.UUID(v)) equal(u, uuid.UUID(v))
equal(str(u), v) equal(str(u), v)
@unittest.skipUnless(os.name == 'posix', 'requires Posix')
def testIssue8621(self): def testIssue8621(self):
import os
import sys
if os.name != 'posix':
return
# On at least some versions of OSX uuid.uuid4 generates # On at least some versions of OSX uuid.uuid4 generates
# the same sequence of UUIDs in the parent and any # the same sequence of UUIDs in the parent and any
# children started using fork. # children started using fork.
......
...@@ -58,6 +58,8 @@ IDLE ...@@ -58,6 +58,8 @@ IDLE
Tests Tests
----- -----
- Issue #18094: test_uuid no more reports skipped tests as passed.
- Issue #11995: test_pydoc doesn't import all sys.path modules anymore. - Issue #11995: test_pydoc doesn't import all sys.path modules anymore.
Documentation Documentation
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment