Merge pull request #3845 from natanlao/patch-1

Remove warning about #568 from documentation
pytest-dev · Aug 22, 2018 · 5b2c8fa · 5b2c8fa
2 parents f1079a8 + eb8d145
commit 5b2c8fa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/changelog/3845.trivial.rst b/changelog/3845.trivial.rst
@@ -0,0 +1,2 @@
+Remove a reference to issue `#568 <https://github.com/pytest-dev/pytest/issues/568>`_ from the documentation, which has since been
+fixed.
diff --git 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 <https://github.com/pytest-dev/pytest/issues/568>`_
-   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:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Remove a reference to issue `#568 <https://github.com/pytest-dev/pytest/issues/568>`_ from the documentation, which has since been
		fixed.