File tree Expand file tree Collapse file tree 6 files changed +7
-7
lines changed Expand file tree Collapse file tree 6 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ You can register custom marks in your ``pytest.ini`` file like this:
40
40
41
41
Note that everything after the ``: `` is an optional description.
42
42
43
- Alternatively, you can register new markers programatically in a
43
+ Alternatively, you can register new markers programmatically in a
44
44
:ref: `pytest_configure <initialization-hooks >` hook:
45
45
46
46
.. code-block :: python
Original file line number Diff line number Diff line change @@ -399,7 +399,7 @@ class DropShorterLongHelpFormatter(argparse.HelpFormatter):
399
399
"""shorten help for long options that differ only in extra hyphens
400
400
401
401
- collapse **long** options that are the same except for extra hyphens
402
- - special action attribute map_long_option allows surpressing additional
402
+ - special action attribute map_long_option allows suppressing additional
403
403
long options
404
404
- shortcut if there are only two options and one of them is a short one
405
405
- cache result on action object as this is called at least 2 times
Original file line number Diff line number Diff line change @@ -370,7 +370,7 @@ def test_excinfo_no_python_sourcecode(tmpdir):
370
370
excinfo = pytest .raises (ValueError , template .render , h = h )
371
371
for item in excinfo .traceback :
372
372
print (item ) # XXX: for some reason jinja.Template.render is printed in full
373
- item .source # shouldnt fail
373
+ item .source # shouldn't fail
374
374
if item .path .basename == "test.txt" :
375
375
assert str (item .source ) == "{{ h()}}:"
376
376
Original file line number Diff line number Diff line change @@ -582,7 +582,7 @@ def test_hello():
582
582
assert "hx" in fnode .toxml ()
583
583
584
584
def test_assertion_binchars (self , testdir ):
585
- """this test did fail when the escaping wasnt strict"""
585
+ """this test did fail when the escaping wasn't strict"""
586
586
testdir .makepyfile (
587
587
"""
588
588
@@ -705,7 +705,7 @@ def getini(self, name):
705
705
return "pytest"
706
706
707
707
junitprefix = None
708
- # XXX: shouldnt need tmpdir ?
708
+ # XXX: shouldn't need tmpdir ?
709
709
xmlpath = str (tmpdir .join ("junix.xml" ))
710
710
register = gotten .append
711
711
Original file line number Diff line number Diff line change @@ -435,7 +435,7 @@ class TestA(object):
435
435
def test_b(self):
436
436
assert True
437
437
class TestC(object):
438
- # this one didnt get marked
438
+ # this one didn't get marked
439
439
def test_d(self):
440
440
assert True
441
441
"""
Original file line number Diff line number Diff line change @@ -253,7 +253,7 @@ def test_fun(self):
253
253
254
254
255
255
def test_setup_teardown_linking_issue265 (testdir ):
256
- # we accidentally didnt integrate nose setupstate with normal setupstate
256
+ # we accidentally didn't integrate nose setupstate with normal setupstate
257
257
# this test ensures that won't happen again
258
258
testdir .makepyfile (
259
259
'''
You can’t perform that action at this time.
0 commit comments