From 0f11d0f778dca3bbaead1d8e2ec71067687d0296 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Fri, 10 Jan 2014 15:05:27 +0200 Subject: [PATCH] Issue #19804: The test_find_mac test in test_uuid is now skipped if the ifconfig executable is not available. --- Lib/test/test_uuid.py | 11 +++++++++++ Misc/NEWS | 3 +++ 2 files changed, 14 insertions(+) diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py index e623417af0..5ba6845191 100644 --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -358,6 +358,17 @@ eth0 Link encap:Ethernet HWaddr 12:34:56:78:90:ab def mock_popen(cmd): return io.BytesIO(data) + path = os.environ.get("PATH", os.defpath).split(os.pathsep) + path.extend(('/sbin', '/usr/sbin')) + for dir in path: + executable = os.path.join(dir, 'ifconfig') + if (os.path.exists(executable) and + os.access(executable, os.F_OK | os.X_OK) and + not os.path.isdir(executable)): + break + else: + self.skipTest('requires ifconfig') + with test_support.swap_attr(os, 'popen', mock_popen): mac = uuid._find_mac( command='ifconfig', diff --git a/Misc/NEWS b/Misc/NEWS index 5999b111f7..ddcf535fd8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -161,6 +161,9 @@ IDLE 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. - Backported tests for Tkinter variables. -- 2.50.1