From: Serhiy Storchaka <storchaka@gmail.com>
Date: Fri, 10 Jan 2014 13:06:59 +0000 (+0200)
Subject: Issue #19804: The test_find_mac test in test_uuid is now skipped if the
X-Git-Tag: v3.3.4rc1~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cce440fab84dc4a3beec755894ac2daa57e173ec;p=thirdparty%2FPython%2Fcpython.git

Issue #19804: The test_find_mac test in test_uuid is now skipped if the
ifconfig executable is not available.
---

diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py
index 072734e7286f..72648089b7c9 100644
--- a/Lib/test/test_uuid.py
+++ b/Lib/test/test_uuid.py
@@ -3,6 +3,7 @@ from test import support
 import builtins
 import io
 import os
+import shutil
 import uuid
 
 def importable(name):
@@ -369,6 +370,11 @@ eth0      Link encap:Ethernet  HWaddr 12:34:56:78:90:ab
         def mock_popen(cmd):
             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):
             mac = uuid._find_mac(
                 command='ifconfig',
diff --git a/Misc/NEWS b/Misc/NEWS
index 65cb2450e7bd..88f718ed9538 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -234,6 +234,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.
 
 - Issue #20055: Fix test_shutil under Windows with symlink privileges held.