jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,574 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

9574 Commits

Author SHA1 Message Date
Bruno Oliveira b759ebdb93 Add CHANGELOG entry for #4698 2019-02-12 10:39:58 -02:00
Bruno Oliveira b41632e9a8 Revert "Show deprecation message when running under Python 2.7 and 3.4" 
This reverts commit eb92e57509.
 2019-02-12 10:39:25 -02:00
Daniel Hahler 31c948184a
Merge pull request #4753 from blueyed/tox-xdist 
tox: add generic xdist factor
 2019-02-11 23:36:59 +01:00
Daniel Hahler 7bee359459 tox: add generic xdist factor 2019-02-11 15:09:07 +01:00
Daniel Hahler ed01dc6567
Merge pull request #4652 from blueyed/RunResult-repr 
Add __repr__ for RunResult
 2019-02-09 01:26:24 +01:00
Daniel Hahler fc8800c71f
Merge pull request #4722 from fetzerch/ignore_wildcards 
Add ability to use globs when using --ignore
 2019-02-09 00:11:04 +01:00
Daniel Hahler 9bcbf552d6 Add __repr__ for RunResult 2019-02-08 23:41:20 +01:00
Daniel Hahler a131cd6c3b
Merge pull request #4749 from blueyed/merge-master-into-features 
Merge master into features
 2019-02-08 22:05:43 +01:00
Daniel Hahler 9c03196e79 Merge master into features 2019-02-08 22:02:29 +01:00
Daniel Hahler 8b92d10fb3
Merge pull request #4751 from blueyed/fix-py-freeze 
tox: py37-freeze: use --no-use-pep517 for PyInstaller
 2019-02-08 22:01:59 +01:00
Bruno Oliveira 8e220f0e6f
Merge pull request #4746 from nicoddemus/isolated-build 
Use isolated_build option in tox.ini
 2019-02-08 18:59:43 -02:00
Daniel Hahler e191a65ebb tox: py37-freeze: use --no-use-pep517 for PyInstaller 
Fixes https://github.com/pytest-dev/pytest/issues/4750.
 2019-02-08 21:59:23 +01:00
Daniel Hahler 5ca81596bb
Merge pull request #4744 from blueyed/fix-4592-collectfile 
Fix handling of collect_ignore from parent conftest
 2019-02-08 20:58:11 +01:00
Daniel Hahler 64e8185ff7 Merge master into features 2019-02-08 20:09:09 +01:00
Bruno Oliveira 9be069f899 Use isolated_build option in tox.ini 
As per the excellent article by gaborbernat:

https://www.bernat.tech/pep-517-518/
 2019-02-08 15:50:33 -02:00
Daniel Hahler 913a2da6e5 Fix handling of collect_ignore from parent conftest 
`_collectfile` should be called on files only.

Fixes https://github.com/pytest-dev/pytest/issues/4592.
 2019-02-08 18:46:43 +01:00
Anthony Sottile ea732464aa
Merge pull request #4740 from asottile/bugfix_4739 
Fix `parametrize(... ids=<function>)` when the function returns non-strings
 2019-02-07 21:47:33 -08:00
Anthony Sottile 4c7ddb8d9b Fix `parametrize(... ids=<function>)` when the function returns non-strings. 2019-02-07 12:25:59 -08:00
Thomas Hisch a1fcd6e445
Merge pull request #4734 from thisch/refactor_clilogging 
Refactor _setup_cli_logging code
 2019-02-07 20:15:41 +01:00
Thomas Hisch 7b8fd0cc12 Refactor _setup_cli_logging code 
Change the indentation in _setup_cli_logging by moving the
self._log_cli_enabled check outside of the _setup_cli_logging method.
 2019-02-07 19:39:12 +01:00
Ronny Pfannschmidt 526f4a95cc
Merge pull request #4735 from kohr-h/pytest_plugins_module_name 
Mention that `pytest_plugins` should not be used as module name
 2019-02-07 07:07:58 +01:00
Ronny Pfannschmidt 4cd268dc5d
Merge pull request #4724 from nicoddemus/pytest-warns-kwargs 
emit warning when pytest.warns receives unknown keyword arguments
 2019-02-07 07:04:25 +01:00
Bruno Oliveira 2f083504ee
Merge pull request #4709 from namurphy/warns-docs 
Document how to customize test failure message for missing warnings
 2019-02-06 20:51:14 -02:00
Zac Hatfield-Dodds 3384ffc6eb
Merge pull request #4725 from nicoddemus/collection-finish 
Call pytest_report_collectionfinish hook when --collect-only is passed
 2019-02-06 12:38:12 -10:00
Bruno Oliveira e276bd3332 pytest.warns emits a warning on unknown keyword arguments 2019-02-06 19:52:13 -02:00
Holger Kohr 7445b5345f Mention that `pytest_plugins` should not be used as module name 2019-02-06 21:57:42 +01:00
Ronny Pfannschmidt 429485e621
Merge pull request #4720 from thisch/removesetupclilogging 
Only call _setup_cli_logging in __init__
 2019-02-06 20:05:41 +01:00
Bruno Oliveira 52d497570b
Merge pull request #4731 from nicoddemus/travis-py38 
Add py38-dev job to Travis
 2019-02-06 16:24:07 -02:00
Christian Fetzer 1876a928d3 Document collect_ignore and collect_ignore_glob in reference 2019-02-06 17:15:30 +01:00
Christian Fetzer 2dc2a19db5 Add ability to exclude files matching glob patterns in conftest.py 
This adds the `collect_ignore_glob` option for `conftest.py` to allow
Unix-style wildcards for excluding files.
 2019-02-06 16:49:43 +01:00
Bruno Oliveira 0c5e717f43 Add py38-dev job to Travis 2019-02-06 13:11:00 -02:00
Bruno Oliveira 54af0f4c65 Call pytest_report_collectionfinish hook when --collect-only is passed 
Fix #2895
 2019-02-06 12:58:23 -02:00
Bruno Oliveira 678dfaa6eb
Merge pull request #4728 from nicoddemus/usage-error-module 
Do not raise UsageError when "pytest_plugins" is a module
 2019-02-06 12:22:12 -02:00
Christian Fetzer fc5d4654e5 Add ability to exclude files matching glob patterns with --ignore-glob 
This adds the `--ignore-glob` option to allow Unix-style wildcards so
that `--ignore-glob=integration*` excludes all tests that reside in
files starting with `integration`.

Fixes: #3711
 2019-02-06 11:29:30 +01:00
Bruno Oliveira 19c93d16d1 Do not raise UsageError when "pytest_plugins" is a module 
Fix #3899
 2019-02-06 08:24:22 -02:00
Thomas Hisch 0ce8b910ca Only call _setup_cli_logging in __init__ 
Supersedes #4719
 2019-02-06 07:03:40 +01:00
Anthony Sottile c780d1fa7c
Merge pull request #4723 from asottile/docstring_fix_py38 
Remove workaround for docstrings for py38+
 2019-02-05 15:23:48 -08:00
Bruno Oliveira 584c052da4 Fix linting and change False to True as requested in review 2019-02-05 19:04:26 -02:00
Anthony Sottile 315374008b Remove workaround for docstrings for py38+ 2019-02-05 12:48:18 -08:00
Ronny Pfannschmidt a9457345ee
Merge pull request #4715 from nicoddemus/fix-changelog-typo 
Fix typo in CHANGELOG
 2019-02-04 13:53:48 +01:00
Bruno Oliveira 726e165932 Fix typo in CHANGELOG 2019-02-04 08:38:48 -02:00
Anthony Sottile 2264db7f4a
Merge pull request #4682 from arel/parameterize-conditional-raises-document-only 
Document parametrizing conditional raises
 2019-02-02 13:15:26 -08:00
Nick Murphy 4e93dc2c97 Update changelog for pytest.warns doc update 2019-02-01 22:11:41 -05:00
Nick Murphy 8003d8d279 Update AUTHORS 2019-02-01 21:55:01 -05:00
Nick Murphy f0ecb25acd Document custom failure messages for missing warnings 2019-02-01 21:48:29 -05:00
Arel Cordero 7ec1a1407a Incorporating feedback from asottile 2019-02-02 01:57:17 +00:00
Bruno Oliveira 7dbe40092d
Merge pull request #4703 from nicoddemus/setup-class-inheritance-4700 
Fix setUpClass being called in subclasses that were skipped
 2019-02-01 16:32:27 -02:00
Bruno Oliveira e53563ebbe
Merge pull request #4706 from hackebrot/add-xfail-note-to-4.2.0-changelog 
Update changelog to reflect spelling change of xfail
 2019-02-01 10:35:46 -02:00
Raphael Pierzina c2c9b27771 Update changelog to reflect spelling change of xfail in teststatus report 
Resolve #4705
 2019-02-01 13:15:35 +01:00
Bruno Oliveira c3d7340542 Fix setUpClass being called in subclasses that were skipped 
Fix #4700
 2019-01-31 20:24:11 -02:00