Merge branch 'master' into Fix-6906

Author: gdhameeja

AUTHORS

@@ -233,6 +233,7 @@ Pulkit Goyal
 Punyashloka Biswal
 Quentin Pradet
 Ralf Schmitt
+Ram Rachum
 Ralph Giles
 Ran Benita
 Raphael Castaneda

CONTRIBUTING.rst

@@ -173,8 +173,10 @@ Short version
    The test environments above are usually enough to cover most cases locally.
 
 #. Write a ``changelog`` entry: ``changelog/2574.bugfix.rst``, use issue id number
-   and one of ``bugfix``, ``removal``, ``feature``, ``vendor``, ``doc`` or
-   ``trivial`` for the issue type.
+   and one of ``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``,
+   ``breaking``, ``vendor`` or ``trivial`` for the issue type.
+
+
 #. Unless your change is a trivial or a documentation fix (e.g., a typo or reword of a small section) please
    add yourself to the ``AUTHORS`` file, in alphabetical order.
 
@@ -274,8 +276,9 @@ Here is a simple overview, with pytest-specific bits:
 
 #. Create a new changelog entry in ``changelog``. The file should be named ``<issueid>.<type>.rst``,
    where *issueid* is the number of the issue related to the change and *type* is one of
-   ``bugfix``, ``removal``, ``feature``, ``vendor``, ``doc`` or ``trivial``. You may not create a
-   changelog entry if the change doesn't affect the documented behaviour of Pytest.
+   ``feature``, ``improvement``, ``bugfix``, ``doc``, ``deprecation``, ``breaking``, ``vendor``
+   or ``trivial``. You may skip creating the changelog entry if the change doesn't affect the
+   documented behaviour of pytest.
 
 #. Add yourself to ``AUTHORS`` file if not there yet, in alphabetical order.
 

changelog/7383.bugfix.rst

@@ -0,0 +1 @@
+Fixed exception causes all over the codebase, i.e. use `raise new_exception from old_exception` when wrapping an exception.

changelog/7385.improvement.rst

@@ -0,0 +1,13 @@
+``--junitxml`` now includes the exception cause in the ``message`` XML attribute for failures during setup and teardown.
+
+Previously:
+
+.. code-block:: xml
+
+    <error message="test setup failure">
+
+Now:
+
+.. code-block:: xml
+
+    <error message="failed on setup with &quot;ValueError: Some error during setup&quot;">

doc/en/example/markers.rst

@@ -639,7 +639,7 @@ Automatically adding markers based on test names
 
 .. regendoc:wipe
 
-If you a test suite where test function names indicate a certain
+If you have a test suite where test function names indicate a certain
 type of test, you can implement a hook that automatically defines
 markers so that you can use the ``-m`` option with it. Let's look
 at this test module:

doc/en/talks.rst

@@ -2,6 +2,11 @@
 Talks and Tutorials
 ==========================
 
+.. sidebar:: Next Open Trainings
+
+   - `Free 1h webinar: "pytest: Test Driven Development für Python" <https://mylearning.ch/kurse/online-kurse/tech-webinar/>`_ (German), online, August 18 2020.
+   - `"pytest: Test Driven Development (nicht nur) für Python" <https://workshoptage.ch/workshops/2020/pytest-test-driven-development-nicht-nur-fuer-python/>`_ (German) at the `CH Open Workshoptage <https://workshoptage.ch/>`_, September 8 2020, HSLU Campus Rotkreuz (ZG), Switzerland.
+
 .. _`funcargs`: funcargs.html
 
 Books

src/_pytest/_code/__init__.py

@@ -6,6 +6,7 @@
 from .code import getfslineno
 from .code import getrawcode
 from .code import Traceback
+from .code import TracebackEntry
 from .source import compile_ as compile
 from .source import Source
 
@@ -17,6 +18,7 @@
     "getfslineno",
     "getrawcode",
     "Traceback",
+    "TracebackEntry",
     "compile",
     "Source",
 ]

src/_pytest/_code/code.py

@@ -213,7 +213,7 @@ def statement(self) -> "Source":
         return source.getstatement(self.lineno)
 
     @property
-    def path(self):
+    def path(self) -> Union[py.path.local, str]:
         """ path to the source code """
         return self.frame.code.path
 

src/_pytest/_code/source.py

@@ -215,7 +215,7 @@ def compile(  # noqa: F811
             newex.offset = ex.offset
             newex.lineno = ex.lineno
             newex.text = ex.text
-            raise newex
+            raise newex from ex
         else:
             if flag & ast.PyCF_ONLY_AST:
                 assert isinstance(co, ast.AST)