From 7be8f68d37b82ffd901eb07fee4ed92a5c8955dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= <neologix@free.fr>
Date: Sun, 27 Nov 2011 12:49:27 +0100
Subject: [PATCH] Issue #13415: Skip test_os.test_unset_error on FreeBSD and OS
 X.

---
 Lib/test/test_os.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 876469b9780..4da1f1d7bea 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -423,6 +423,10 @@ class EnvironTests(mapping_tests.BasicTestMappingProtocol):
         value_str = value.decode(sys.getfilesystemencoding(), 'surrogateescape')
         self.assertEqual(os.environ['bytes'], value_str)
 
+    # On FreeBSD < 7 and OS X < 10.6, unsetenv() doesn't return a value (issue
+    # #13415).
+    @unittest.skipIf(sys.platform.startswith(('freebsd', 'darwin')),
+                     "due to known OS bug: see issue #13415")
     def test_unset_error(self):
         if sys.platform == "win32":
             # an environment variable is limited to 32,767 characters