Merge master into features (#6111)

Author: blueyed

.travis.yml

@@ -60,7 +60,7 @@ jobs:
     - env: TOXENV=py37-freeze
 
     - env: TOXENV=py38-xdist
-      python: '3.8-dev'
+      python: '3.8'
 
     - stage: baseline
       env: TOXENV=py36-xdist
@@ -94,11 +94,6 @@ jobs:
           tags: true
           repo: pytest-dev/pytest
 
-matrix:
-  allow_failures:
-    - python: '3.8-dev'
-      env: TOXENV=py38-xdist
-
 before_script:
   - |
     # Do not (re-)upload coverage with cron runs.

CHANGELOG.rst

@@ -13,7 +13,7 @@ with advance notice in the **Deprecations** section of releases.
     file is managed by towncrier. You *may* edit previous change logs to
     fix problems like typo corrections or such.
     To add a new change log entry, please see
-    https://pip.pypa.io/en/latest/development/#adding-a-news-entry
+    https://pip.pypa.io/en/latest/development/contributing/#news-entries
     we named the news folder changelog
 
 .. towncrier release notes start

changelog/6099.bugfix.rst

@@ -0,0 +1 @@
+Fix ``--trace`` when used with parametrized functions.

src/_pytest/_code/code.py

@@ -137,7 +137,7 @@ def eval(self, code, **vars):
     def exec_(self, code, **vars):
         """ exec 'code' in the frame
 
-            'vars' are optiona; additional local variables
+            'vars' are optional; additional local variables
         """
         f_locals = self.f_locals.copy()
         f_locals.update(vars)
@@ -207,7 +207,7 @@ def path(self):
 
     @property
     def locals(self):
-        """ locals of underlaying frame """
+        """ locals of underlying frame """
         return self.frame.f_locals
 
     def getfirstlinesource(self):
@@ -274,7 +274,7 @@ def __str__(self):
 
     @property
     def name(self):
-        """ co_name of underlaying code """
+        """ co_name of underlying code """
         return self.frame.code.raw.co_name
 
 
@@ -302,7 +302,7 @@ def f(cur):
     def cut(self, path=None, lineno=None, firstlineno=None, excludepath=None):
         """ return a Traceback instance wrapping part of this Traceback
 
-            by provding any combination of path, lineno and firstlineno, the
+            by providing any combination of path, lineno and firstlineno, the
             first frame to start the to-be-returned traceback is determined
 
             this allows cutting the first part of a Traceback instance e.g.
@@ -1008,7 +1008,7 @@ def __init__(self, path, lineno, message):
 
     def toterminal(self, tw) -> None:
         # filename and lineno output for each entry,
-        # using an output format that most editors unterstand
+        # using an output format that most editors understand
         msg = self.message
         i = msg.find("\n")
         if i != -1:

src/_pytest/assertion/util.py

@@ -38,7 +38,6 @@ def format_explanation(explanation: str) -> str:
     for when one explanation needs to span multiple lines, e.g. when
     displaying diffs.
     """
-    explanation = explanation
     lines = _split_explanation(explanation)
     result = _format_lines(lines)
     return "\n".join(result)

src/_pytest/debugging.py

@@ -1,5 +1,6 @@
 """ interactive debugging with PDB, the Python Debugger. """
 import argparse
+import functools
 import sys
 
 from _pytest import outcomes
@@ -278,13 +279,16 @@ def pytest_pyfunc_call(self, pyfuncitem):
 def _test_pytest_function(pyfuncitem):
     _pdb = pytestPDB._init_pdb("runcall")
     testfunction = pyfuncitem.obj
-    pyfuncitem.obj = _pdb.runcall
-    if "func" in pyfuncitem._fixtureinfo.argnames:  # pragma: no branch
-        raise ValueError("--trace can't be used with a fixture named func!")
-    pyfuncitem.funcargs["func"] = testfunction
-    new_list = list(pyfuncitem._fixtureinfo.argnames)
-    new_list.append("func")
-    pyfuncitem._fixtureinfo.argnames = tuple(new_list)
+
+    # we can't just return `partial(pdb.runcall, testfunction)` because (on
+    # python < 3.7.4) runcall's first param is `func`, which means we'd get
+    # an exception if one of the kwargs to testfunction was called `func`
+    @functools.wraps(testfunction)
+    def wrapper(*args, **kwargs):
+        func = functools.partial(testfunction, *args, **kwargs)
+        _pdb.runcall(func)
+
+    pyfuncitem.obj = wrapper
 
 
 def _enter_pdb(node, excinfo, rep):

src/_pytest/junitxml.py

@@ -513,7 +513,7 @@ def node_reporter(self, report):
         key = nodeid, slavenode
 
         if key in self.node_reporters:
-            # TODO: breasks for --dist=each
+            # TODO: breaks for --dist=each
             return self.node_reporters[key]
 
         reporter = _NodeReporter(nodeid, self)

src/_pytest/main.py

@@ -437,7 +437,7 @@ def gethookproxy(self, fspath):
             # one or more conftests are not in use at this fspath
             proxy = FSHookProxy(fspath, pm, remove_mods)
         else:
-            # all plugis are active for this fspath
+            # all plugins are active for this fspath
             proxy = self.config.hook
         return proxy
 

src/_pytest/mark/evaluate.py

@@ -28,7 +28,7 @@ def __init__(self, item, name):
         self._mark_name = name
 
     def __bool__(self):
-        # dont cache here to prevent staleness
+        # don't cache here to prevent staleness
         return bool(self._get_marks())
 
     __nonzero__ = __bool__

src/_pytest/mark/legacy.py

@@ -1,6 +1,6 @@
 """
 this is a place where we put datastructures used by legacy apis
-we hope ot remove
+we hope to remove
 """
 import keyword