From 717775a1c69e21fff65c73d2a33e4bdc6a15c50e Mon Sep 17 00:00:00 2001 From: Natan Lao Date: Tue, 21 Aug 2018 16:57:33 -0700 Subject: [PATCH 1/3] Remove warning about #568 from documentation The documentation (https://docs.pytest.org/en/latest/skipping.html) references issue #568, which has since been fixed. --- doc/en/skipping.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/doc/en/skipping.rst b/doc/en/skipping.rst index cda67554d58..efdf008fb69 100644 --- a/doc/en/skipping.rst +++ b/doc/en/skipping.rst @@ -136,12 +136,6 @@ You can use the ``skipif`` marker (as any other marker) on classes:: If the condition is ``True``, this marker will produce a skip result for each of the test methods of that class. -.. warning:: - - The use of ``skipif`` on classes that use inheritance is strongly - discouraged. `A Known bug `_ - in pytest's markers may cause unexpected behavior in super classes. - If you want to skip all test functions of a module, you may use the ``pytestmark`` name on the global level: From 80bea79512b28d266dc8b9b9be919426990fc7a3 Mon Sep 17 00:00:00 2001 From: Natan Lao Date: Tue, 21 Aug 2018 17:03:59 -0700 Subject: [PATCH 2/3] Add changelog entry --- changelog/3845.trivial.rst | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelog/3845.trivial.rst diff --git a/changelog/3845.trivial.rst b/changelog/3845.trivial.rst new file mode 100644 index 00000000000..8b32abaca53 --- /dev/null +++ b/changelog/3845.trivial.rst @@ -0,0 +1,2 @@ +Remove a reference to issue #568 from the documentation, which has since been +fixed. \ No newline at end of file From eb8d14519527dc3469c1663ecc1c5bbd9d73d454 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Tue, 21 Aug 2018 21:08:21 -0300 Subject: [PATCH 3/3] Add link to issue in the CHANGELOG entry --- changelog/3845.trivial.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/changelog/3845.trivial.rst b/changelog/3845.trivial.rst index 8b32abaca53..29c45ab56f2 100644 --- a/changelog/3845.trivial.rst +++ b/changelog/3845.trivial.rst @@ -1,2 +1,2 @@ -Remove a reference to issue #568 from the documentation, which has since been -fixed. \ No newline at end of file +Remove a reference to issue `#568 `_ from the documentation, which has since been +fixed.