Kaydet (Commit) cce440fa authored tarafından Serhiy Storchaka's avatar Serhiy Storchaka

Issue #19804: The test_find_mac test in test_uuid is now skipped if the

ifconfig executable is not available.
üst 4847e4e1
...@@ -3,6 +3,7 @@ from test import support ...@@ -3,6 +3,7 @@ from test import support
import builtins import builtins
import io import io
import os import os
import shutil
import uuid import uuid
def importable(name): def importable(name):
...@@ -369,6 +370,11 @@ eth0 Link encap:Ethernet HWaddr 12:34:56:78:90:ab ...@@ -369,6 +370,11 @@ eth0 Link encap:Ethernet HWaddr 12:34:56:78:90:ab
def mock_popen(cmd): def mock_popen(cmd):
return io.StringIO(data) return io.StringIO(data)
if shutil.which('ifconfig') is None:
path = os.pathsep.join(('/sbin', '/usr/sbin'))
if shutil.which('ifconfig', path=path) is None:
self.skipTest('requires ifconfig')
with support.swap_attr(os, 'popen', mock_popen): with support.swap_attr(os, 'popen', mock_popen):
mac = uuid._find_mac( mac = uuid._find_mac(
command='ifconfig', command='ifconfig',
......
...@@ -234,6 +234,9 @@ IDLE ...@@ -234,6 +234,9 @@ IDLE
Tests Tests
----- -----
- Issue #19804: The test_find_mac test in test_uuid is now skipped if the
ifconfig executable is not available.
- Issue #19886: Use better estimated memory requirements for bigmem tests. - Issue #19886: Use better estimated memory requirements for bigmem tests.
- Issue #20055: Fix test_shutil under Windows with symlink privileges held. - Issue #20055: Fix test_shutil under Windows with symlink privileges held.
......
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