summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-10-17 11:40:00 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-10-17 11:40:00 (GMT)
commit86823a52fcaa56fdd913495d2e7a6e5c9b5c7781 (patch)
tree84210964b4beef9ea952484d6961b744979a0f73
parente4508eebb43bfc563192bb60a510d8d91cc6129d (diff)
downloadcpython-86823a52fcaa56fdd913495d2e7a6e5c9b5c7781.zip
cpython-86823a52fcaa56fdd913495d2e7a6e5c9b5c7781.tar.gz
cpython-86823a52fcaa56fdd913495d2e7a6e5c9b5c7781.tar.bz2
Issue #19275: Fix test_site on AMD64 Snow Leopard
-rw-r--r--Lib/test/test_site.py5
-rw-r--r--Misc/NEWS2
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index 3ada0a6..5b3d961 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -443,8 +443,9 @@ class StartupImportTests(unittest.TestCase):
self.assertFalse(modules.intersection(re_mods), stderr)
# http://bugs.python.org/issue9548
self.assertNotIn('locale', modules, stderr)
- # http://bugs.python.org/issue19209
- self.assertNotIn('copyreg', modules, stderr)
+ if sys.platform != 'darwin':
+ # http://bugs.python.org/issue19209
+ self.assertNotIn('copyreg', modules, stderr)
# http://bugs.python.org/issue19218>
collection_mods = {'_collections', 'collections', 'functools',
'heapq', 'itertools', 'keyword', 'operator',
diff --git a/Misc/NEWS b/Misc/NEWS
index ddca1f5..f9ede51 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -123,6 +123,8 @@ Library
Tests
-----
+- Issue #19275: Fix test_site on AMD64 Snow Leopard
+
- Issue #14407: Fix unittest test discovery in test_concurrent_futures.
- Issue #18919: Unified and extended tests for audio modules: aifc, sunau and