jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3469 from scop/dropthedot 

#dropthedot
This commit is contained in:
Bruno Oliveira 2018-05-15 08:00:28 -03:00 committed by GitHub
parent 01d2d81d1f b4370c08b9
commit a4425cb4af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/freeze_support.py
View File

@ -7,7 +7,7 @@ from __future__ import absolute_import, division, print_function
def freeze_includes(): def freeze_includes():
""" """
Returns a list of module names used by py.test that should be Returns a list of module names used by pytest that should be
included by cx_freeze. included by cx_freeze.
""" """
import py import py

4
_pytest/pytester.py
View File

@ -714,7 +714,7 @@ class Testdir(object):
""" """
finalizers = [] finalizers = []
try: try:
# When running py.test inline any plugins active in the main test # When running pytest inline any plugins active in the main test
# process are already imported. So this disables the warning which # process are already imported. So this disables the warning which
# will trigger to say they can no longer be rewritten, which is # will trigger to say they can no longer be rewritten, which is
# fine as they have already been rewritten. # fine as they have already been rewritten.
@ -725,7 +725,7 @@ class Testdir(object):
finalizers.append(revert_warn_already_imported) finalizers.append(revert_warn_already_imported)
AssertionRewritingHook._warn_already_imported = lambda *a: None AssertionRewritingHook._warn_already_imported = lambda *a: None
# Any sys.module or sys.path changes done while running py.test # Any sys.module or sys.path changes done while running pytest
# inline should be reverted after the test run completes to avoid # inline should be reverted after the test run completes to avoid
# clashing with later inline tests run within the same pytest test, # clashing with later inline tests run within the same pytest test,
# e.g. just because they use matching test module names. # e.g. just because they use matching test module names.

2
doc/en/cache.rst
View File

@ -234,7 +234,7 @@ Inspecting Cache content
You can always peek at the content of the cache using the You can always peek at the content of the cache using the
``--cache-show`` command line option:: ``--cache-show`` command line option::
$ py.test --cache-show $ pytest --cache-show
=========================== test session starts ============================ =========================== test session starts ============================
platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y platform linux -- Python 3.x.y, pytest-3.x.y, py-1.x.y, pluggy-0.x.y
rootdir: $REGENDOC_TMPDIR, inifile: rootdir: $REGENDOC_TMPDIR, inifile:

6
doc/en/example/pythoncollection.rst
View File

@ -54,7 +54,7 @@ Keeping duplicate paths specified from command line
Default behavior of ``pytest`` is to ignore duplicate paths specified from the command line. Default behavior of ``pytest`` is to ignore duplicate paths specified from the command line.
Example:: Example::
py.test path_a path_a pytest path_a path_a
... ...
collected 1 item collected 1 item
@ -65,7 +65,7 @@ Just collect tests once.
To collect duplicate tests, use the ``--keep-duplicates`` option on the cli. To collect duplicate tests, use the ``--keep-duplicates`` option on the cli.
Example:: Example::
py.test --keep-duplicates path_a path_a pytest --keep-duplicates path_a path_a
... ...
collected 2 items collected 2 items
@ -75,7 +75,7 @@ As the collector just works on directories, if you specify twice a single test f
still collect it twice, no matter if the ``--keep-duplicates`` is not specified. still collect it twice, no matter if the ``--keep-duplicates`` is not specified.
Example:: Example::
py.test test_a.py test_a.py pytest test_a.py test_a.py
... ...
collected 2 items collected 2 items