Update integration tests for new site-packages location

test/extra/avro_test.py

@@ -16,7 +16,7 @@ subprocess.check_call(["wget", url], cwd=ENV_NAME)
 subprocess.check_call(["tar", "-zxf", "avro-1.7.7.tar.gz"], cwd=ENV_NAME)
 
 env = os.environ
-env["PYTHONPATH"] = os.path.abspath(os.path.join(ENV_NAME, "site-packages"))
+env["PYTHONPATH"] = os.path.abspath(os.path.join(ENV_NAME, "lib/python2.7/site-packages"))
 
 # this tests also fail when run in cpython with nose.
 # pytest makes two of this work but we can't currently run pytest...

test/extra/flask_test.py

@@ -17,7 +17,7 @@ create_virtenv(ENV_NAME,
                 "markupsafe == 0.23"]
                , force_create = True)
 
-sys.path.append(ENV_NAME + "/site-packages")
+sys.path.append(ENV_NAME + "/lib/python2.7/site-packages")
 
 from flask import Flask, Markup
 from jinja2 import Template 

test/extra/pyopenssl_test.py

@@ -5,7 +5,7 @@ from test_helper import create_virtenv, run_test
 
 ENV_NAME = os.path.abspath("pyopenssl_test_env_" + os.path.basename(sys.executable))
 NOSETESTS_EXE = os.path.abspath(os.path.join(ENV_NAME, "bin", "nosetests"))
-PYOPENSSL_DIR = os.path.abspath(os.path.join(ENV_NAME, "site-packages", "OpenSSL"))
+PYOPENSSL_DIR = os.path.abspath(os.path.join(ENV_NAME, "lib", "python2.7", "site-packages", "OpenSSL"))
 
 packages = ["nose==1.3.7", "pycparser==2.13", "cryptography==1.0.1", "pyopenssl==0.15.1", "pyasn1==0.1.7", "idna==2.0", "six==1.9.0", "enum34==1.0.4", "ipaddress==1.0.14", "cffi==1.1.0"]
 create_virtenv(ENV_NAME, packages, force_create = True)

test/extra/sqlalchemy_0.5_smalltest.py

@@ -34,7 +34,6 @@ python_exe = os.path.abspath(ENV_NAME + "/bin/python")
 
 sys.path.append(SQLALCHEMY_DIR + "/lib")
 sys.path.insert(0, SQLALCHEMY_DIR)
-sys.path.append(ENV_NAME + "/site-packages")
 sys.path.append(ENV_NAME + "/lib/python2.7/site-packages")
 
 os.chdir(SQLALCHEMY_DIR)

test/integration/pycrypto_test.py

@@ -33,7 +33,7 @@ print "-- Installing pycrypto"
 subprocess.check_call([sys.executable, "setup.py", "install", "--prefix=install"], stdout=devnull)
 
 print "-- Testing pycrypto"
-sys.path.append("install/site-packages")
+sys.path.append("install/lib/python2.7/site-packages")
 
 test_string = "test string".ljust(16)
 

test/integration/sqlalchemy_smalltest.py

@@ -33,7 +33,6 @@ python_exe = os.path.abspath(ENV_NAME + "/bin/python")
 
 sys.path.append(SQLALCHEMY_DIR + "/lib")
 sys.path.insert(0, SQLALCHEMY_DIR)
-sys.path.append(ENV_NAME + "/site-packages")
 sys.path.append(ENV_NAME + "/lib/python2.7/site-packages")
 
 os.chdir(SQLALCHEMY_DIR)