]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #19360: fix test_site when Python is installed into $HOME/.local
authorAntoine Pitrou <solipsis@pitrou.net>
Wed, 23 Oct 2013 20:03:22 +0000 (22:03 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Wed, 23 Oct 2013 20:03:22 +0000 (22:03 +0200)
Lib/test/test_site.py

index 16081a1e1eb89d03bc7ecc9e16285092fe7702fc..db94b7b2a70fc89f3be89e0cc7c00168960ccadb 100644 (file)
@@ -179,14 +179,20 @@ class HelperFunctionsTests(unittest.TestCase):
         rc = subprocess.call([sys.executable, '-s', '-c',
             'import sys; sys.exit(%r in sys.path)' % usersite],
             env=env)
-        self.assertEqual(rc, 0)
+        if usersite == site.getsitepackages()[0]:
+            self.assertEqual(rc, 1)
+        else:
+            self.assertEqual(rc, 0)
 
         env = os.environ.copy()
         env["PYTHONNOUSERSITE"] = "1"
         rc = subprocess.call([sys.executable, '-c',
             'import sys; sys.exit(%r in sys.path)' % usersite],
             env=env)
-        self.assertEqual(rc, 0)
+        if usersite == site.getsitepackages()[0]:
+            self.assertEqual(rc, 1)
+        else:
+            self.assertEqual(rc, 0)
 
         env = os.environ.copy()
         env["PYTHONUSERBASE"] = "/tmp"