Skip to content

Commit

Permalink
Merge pull request pytest-dev#1987 from Budulianin/master
Browse files Browse the repository at this point in the history
Update fixture.rst
  • Loading branch information
nicoddemus committed Oct 5, 2016
2 parents cf13355 + 65ebc75 commit 3301a1c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ Georgy Dyuldin
Graham Horler
Greg Price
Grig Gheorghiu
Grigorii Eremeev (budulianin)
Guido Wesdorp
Harald Armin Massa
Ian Bicking
Expand Down
2 changes: 1 addition & 1 deletion doc/en/fixture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ Using fixtures from classes, modules or projects
Sometimes test functions do not directly need access to a fixture object.
For example, tests may require to operate with an empty directory as the
current working directory but otherwise do not care for the concrete
directory. Here is how you can can use the standard `tempfile
directory. Here is how you can use the standard `tempfile
<http://docs.python.org/library/tempfile.html>`_ and pytest fixtures to
achieve it. We separate the creation of the fixture into a conftest.py
file::
Expand Down

0 comments on commit 3301a1c

Please sign in to comment.