[pypy-commit] pypy pytest-25: hg merge default

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: pytest-25
Changeset: r70620:7d24a35ccfef
Date: 2014-04-13 19:32 +0100
http://bitbucket.org/pypy/pypy/changeset/7d24a35ccfef/

Log:	hg merge default

diff --git a/pypy/module/cppyy/test/conftest.py b/pypy/module/cppyy/test/conftest.py
--- a/pypy/module/cppyy/test/conftest.py
+++ b/pypy/module/cppyy/test/conftest.py
@@ -1,5 +1,6 @@
 import py
 
+ at py.test.mark.tryfirst
 def pytest_runtest_setup(item):
     if py.path.local.sysfind('genreflex') is None:
         py.test.skip("genreflex is not installed")
diff --git a/rpython/jit/backend/conftest.py b/rpython/jit/backend/conftest.py
--- a/rpython/jit/backend/conftest.py
+++ b/rpython/jit/backend/conftest.py
@@ -6,7 +6,7 @@
 
 def pytest_addoption(parser):
     group = parser.getgroup('random test options')
-    group.addoption('--random-seed', action="store", type="int",
+    group.addoption('--random-seed', action="store", type=int,
                     default=random.randrange(0, 10000),
                     dest="randomseed",
                     help="choose a fixed random seed")
@@ -15,19 +15,19 @@
                     choices=['llgraph', 'cpu'],
                     dest="backend",
                     help="select the backend to run the functions with")
-    group.addoption('--block-length', action="store", type="int",
+    group.addoption('--block-length', action="store", type=int,
                     default=30,
                     dest="block_length",
                     help="insert up to this many operations in each test")
-    group.addoption('--n-vars', action="store", type="int",
+    group.addoption('--n-vars', action="store", type=int,
                     default=10,
                     dest="n_vars",
                     help="supply this many randomly-valued arguments to "
                          "the function")
-    group.addoption('--repeat', action="store", type="int",
+    group.addoption('--repeat', action="store", type=int,
                     default=15,
                     dest="repeat",
                     help="run the test this many times"),
-    group.addoption('--output', '-O', action="store", type="str",
+    group.addoption('--output', '-O', action="store", type=str,
                     default="", dest="output",
                     help="dump output to a file")