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

Merge pull request #3422 from rachel1792/master 

updated doc to delete deprecated hook: Issue #3417
This commit is contained in:
Bruno Oliveira 2018-04-23 19:24:52 -03:00 committed by GitHub
parent 2a480c59ae 6ea4c12da7
commit d61a7670a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/en/example/simple.rst
View File

@ -102,7 +102,7 @@ the command line arguments before they get processed:
# content of conftest.py # content of conftest.py
import sys import sys
def pytest_cmdline_preparse(args): def pytest_load_initial_conftests(args):
if 'xdist' in sys.modules: # pytest-xdist plugin if 'xdist' in sys.modules: # pytest-xdist plugin
import multiprocessing import multiprocessing
num = max(multiprocessing.cpu_count() / 2, 1) num = max(multiprocessing.cpu_count() / 2, 1)