Skip to content

Commit

Permalink
Merge pull request #1209 from jeffwidman/master
Browse files Browse the repository at this point in the history
Fix spelling: explicitely --> explicitly
  • Loading branch information
RonnyPfannschmidt committed Dec 1, 2015
2 parents ce4eb51 + 6be6798 commit def5439
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion ISSUES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ tags: feature

- introduce pytest.mark.nocollect for not considering a function for
test collection at all. maybe also introduce a pytest.mark.test to
explicitely mark a function to become a tested one. Lookup JUnit ways
explicitly mark a function to become a tested one. Lookup JUnit ways
of tagging tests.

introduce pytest.mark.importorskip
Expand Down
2 changes: 1 addition & 1 deletion _pytest/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -469,7 +469,7 @@ def skip(msg=""):
skip.Exception = Skipped

def fail(msg="", pytrace=True):
""" explicitely fail an currently-executing test with the given Message.
""" explicitly fail an currently-executing test with the given Message.
:arg pytrace: if false the msg represents the full failure information
and no python traceback will be reported.
Expand Down
2 changes: 1 addition & 1 deletion _pytest/vendored_packages/pluggy.py
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ class _MultiCall:

# XXX note that the __multicall__ argument is supported only
# for pytest compatibility reasons. It was never officially
# supported there and is explicitely deprecated since 2.8
# supported there and is explicitly deprecated since 2.8
# so we can remove it soon, allowing to avoid the below recursion
# in execute() and simplify/speed up the execute loop.

Expand Down
2 changes: 1 addition & 1 deletion doc/en/example/markers.rst
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ For an example on how to add and work with markers from a plugin, see

.. note::

It is recommended to explicitely register markers so that:
It is recommended to explicitly register markers so that:

* there is one place in your test suite defining your markers

Expand Down

0 comments on commit def5439

Please sign in to comment.