Merge remote-tracking branch 'upstream/master' into merge-master-into-features

2018-10-13 08:50:32 -03:00
parent 933de16fe4 eabf15b626
commit 29d5849519
20 changed files with 47 additions and 51 deletions
@@ -178,7 +178,7 @@ Mark a test function as using the given fixture names.

 .. warning::

-    This mark can be used with *test functions* only, having no affect when applied
+    This mark has no effect when applied
    to a **fixture** function.

 .. py:function:: pytest.mark.usefixtures(*names)