Snap for 8188146 from 9f0bad686d0e7517a28c3992cd768f9111ff276f to tm-frc-media-release

Change-Id: I1ff0857ac8ea829889e5bb214ac7c7f9fe78691f

1 files changed, 3 insertions, 8 deletions

diff --git a/testing/cffi0/test_zintegration.py b/testing/cffi0/test_zintegration.py
index ce925b8..d56dac2 100644
--- a/testing/cffi0/test_zintegration.py
+++ b/testing/cffi0/test_zintegration.py
@@ -1,13 +1,11 @@
 import py, os, sys, shutil
 import subprocess
 from testing.udir import udir
-import pytest
 
 if sys.platform == 'win32':
-    pytestmark = pytest.mark.skip('snippets do not run on win32')
+    py.test.skip('snippets do not run on win32')
 if sys.version_info < (2, 7):
-    pytestmark = pytest.mark.skip(
-                 'fails e.g. on a Debian/Ubuntu which patches virtualenv'
+    py.test.skip('fails e.g. on a Debian/Ubuntu which patches virtualenv'
                  ' in a non-2.6-friendly way')
 
 def create_venv(name):
@@ -77,10 +75,7 @@ def really_run_setup_and_program(dirname, venv_dir_and_paths, python_snippet):
         env = os.environ.copy()
         env['PYTHONPATH'] = paths
         subprocess.check_call((vp, 'setup.py', 'clean'), env=env)
-        # there's a setuptools/easy_install bug that causes this to fail when the build/install occur together and
-        # we're in the same directory with the build (it tries to look up dependencies for itself on PyPI);
-        # subsequent runs will succeed because this test doesn't properly clean up the build- use pip for now.
-        subprocess.check_call((vp, '-m', 'pip', 'install', '.'), env=env)
+        subprocess.check_call((vp, 'setup.py', 'install'), env=env)
         subprocess.check_call((vp, str(python_f)), env=env)
     finally:
         os.chdir(olddir)