[pypy-commit] pypy py3k: Skip in test_app_main instead of failing if there is no python3.3

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: py3k
Changeset: r87455:a71ca3c65328
Date: 2016-09-29 19:38 +0100
http://bitbucket.org/pypy/pypy/changeset/a71ca3c65328/

Log:	Skip in test_app_main instead of failing if there is no python3.3

diff --git a/pypy/interpreter/test/test_app_main.py b/pypy/interpreter/test/test_app_main.py
--- a/pypy/interpreter/test/test_app_main.py
+++ b/pypy/interpreter/test/test_app_main.py
@@ -17,8 +17,7 @@
 def get_python3():
     if PYTHON3:
         return PYTHON3
-    import py.test
-    py.test.fail("Test requires %r (not found in PATH) or a PYTHON3 "
+    py.test.skip("Test requires %r (not found in PATH) or a PYTHON3 "
                  "environment variable set" % (LOOK_FOR_PYTHON3,))
 
 _counter = 0
@@ -51,7 +50,8 @@
     # return relative path for testing purposes
     return py.path.local().bestrelpath(pdir)
 
-def pytest_funcarg__demo_script(request):
+ at py.test.fixture
+def demo_script():
     return getscript("""
         print('hello')
         print('Name:', __name__)
@@ -64,7 +64,8 @@
         myvalue = 6*7
     """)
 
-def pytest_funcarg__crashing_demo_script(request):
+ at py.test.fixture
+def crashing_demo_script():
     return getscript("""
         print('Hello2')
         myvalue2 = 11