[Python-checkins] cpython (2.7): Fix test_sysconfig when prefix != exec-prefix (#9100).

[eric.araujo]

http://hg.python.org/cpython/rev/27045f93e4cb
changeset:   72832:27045f93e4cb
branch:      2.7
user:        Éric Araujo <merwok at netwok.org>
date:        Sat Oct 08 02:49:12 2011 +0200
summary:
  Fix test_sysconfig when prefix != exec-prefix (#9100).

Reported by Zsolt Cserna.

files:
  Lib/test/test_sysconfig.py |  13 ++++++++-----
  1 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -1,9 +1,5 @@
-"""Tests for 'site'.
+"""Tests for sysconfig."""
 
-Tests assume the initial paths in sys.path once the interpreter has begun
-executing have not been removed.
-
-"""
 import unittest
 import sys
 import os
@@ -259,8 +255,15 @@
         # is similar to the global posix_prefix one
         base = get_config_var('base')
         user = get_config_var('userbase')
+        # the global scheme mirrors the distinction between prefix and
+        # exec-prefix but not the user scheme, so we have to adapt the paths
+        # before comparing (issue #9100)
+        adapt = sys.prefix != sys.exec_prefix
         for name in ('stdlib', 'platstdlib', 'purelib', 'platlib'):
             global_path = get_path(name, 'posix_prefix')
+            if adapt:
+                global_path = global_path.replace(sys.exec_prefix, sys.prefix)
+                base = base.replace(sys.exec_prefix, sys.prefix)
             user_path = get_path(name, 'posix_user')
             self.assertEqual(user_path, global_path.replace(base, user, 1))
 

-- 
Repository URL: http://hg.python.org/cpython