floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5657 from helloocc/master 

Doc fix: delete useless.
This commit is contained in:
Bruno Oliveira 2019-07-24 15:22:58 -03:00 committed by GitHub
parent bd34bd872a 1d8f668e10
commit d89c88478d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -258,6 +258,7 @@ Wil Cooley
William Lee William Lee
Wim Glenn Wim Glenn
Wouter van Ackooy Wouter van Ackooy
Xixi Zhao
Xuan Luong Xuan Luong
Xuecong Liao Xuecong Liao
Zac Hatfield-Dodds Zac Hatfield-Dodds

3
doc/en/fixture.rst
View File

@ -307,7 +307,6 @@ The fixtures requested by ``test_foo`` will be instantiated in the following ord
1. ``s1``: is the highest-scoped fixture (``session``). 1. ``s1``: is the highest-scoped fixture (``session``).
2. ``m1``: is the second highest-scoped fixture (``module``). 2. ``m1``: is the second highest-scoped fixture (``module``).
because it is a dependency of ``f1``.
3. ``a1``: is a ``function``-scoped ``autouse`` fixture: it will be instantiated before other fixtures 3. ``a1``: is a ``function``-scoped ``autouse`` fixture: it will be instantiated before other fixtures
within the same scope. within the same scope.
4. ``f3``: is a ``function``-scoped fixture, required by ``f1``: it needs to be instantiated at this point 4. ``f3``: is a ``function``-scoped fixture, required by ``f1``: it needs to be instantiated at this point
@ -541,7 +540,7 @@ of a fixture is needed multiple times in a single test. Instead of returning
data directly, the fixture instead returns a function which generates the data. data directly, the fixture instead returns a function which generates the data.
This function can then be called multiple times in the test. This function can then be called multiple times in the test.
Factories can have have parameters as needed:: Factories can have parameters as needed::
@pytest.fixture @pytest.fixture
def make_customer_record(): def make_customer_record():

2
doc/en/index.rst
View File

@ -61,7 +61,7 @@ Features
- Can run :ref:`unittest <unittest>` (including trial) and :ref:`nose <noseintegration>` test suites out of the box; - Can run :ref:`unittest <unittest>` (including trial) and :ref:`nose <noseintegration>` test suites out of the box;
- Python Python 3.5+ and PyPy 3; - Python 3.5+ and PyPy 3;
- Rich plugin architecture, with over 315+ `external plugins <http://plugincompat.herokuapp.com>`_ and thriving community; - Rich plugin architecture, with over 315+ `external plugins <http://plugincompat.herokuapp.com>`_ and thriving community;