summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2010-05-13 23:59:41 (GMT)
committerBrett Cannon <bcannon@gmail.com>2010-05-13 23:59:41 (GMT)
commitda9af75d5f1be42097bc9929e48e9eee43555690 (patch)
treeed434298cf4c2d880f3f6fa1fcca2013e9be08b7
parentb3d05540409641eb44b9aea178379adae4c3c221 (diff)
downloadcpython-da9af75d5f1be42097bc9929e48e9eee43555690.zip
cpython-da9af75d5f1be42097bc9929e48e9eee43555690.tar.gz
cpython-da9af75d5f1be42097bc9929e48e9eee43555690.tar.bz2
test_site was failing under darwin for non-framework builds because a test was
assuming framework-specific site-packages directories were being used.
-rw-r--r--Lib/test/test_site.py3
-rw-r--r--Misc/NEWS8
2 files changed, 10 insertions, 1 deletions
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index e59fce2..192f58a 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -182,7 +182,8 @@ class HelperFunctionsTests(unittest.TestCase):
self.assertEquals(dirs[1], wanted)
# let's try the specific Apple location
- if sys.platform == "darwin":
+ if (sys.platform == "darwin" and
+ sysconfig.get_config_var("PYTHONFRAMEWORK")):
site.PREFIXES = ['Python.framework']
dirs = site.getsitepackages()
self.assertEqual(len(dirs), 4)
diff --git a/Misc/NEWS b/Misc/NEWS
index 803e060..b625e7b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,14 @@ Extension Modules
- Issue #8674: Fixed a number of incorrect or undefined-behaviour-inducing
overflow checks in the audioop module.
+Tests
+-----
+
+- On darwin, test_site assumed that a framework build was being used, leading
+ to a failure where four directories were expected for site-packages instead
+ of two in a non-framework build.
+
+
What's New in Python 2.7 beta 2?
================================