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

9555 Commits

Author SHA1 Message Date
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 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
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
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
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
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
Bruno Oliveira 7dcd9bf5ad
Merge pull request #4696 from nicoddemus/release-4.2.0 
Release 4.2.0
 2019-01-30 19:37:00 -02:00
Bruno Oliveira fa979a4290 Preparing release version 4.2.0 2019-01-30 14:25:38 -02:00
Bruno Oliveira e2a15c79e7
Merge pull request #4692 from nicoddemus/merge-master-into-features 
Merge master into features
 2019-01-30 14:16:09 -02:00
Bruno Oliveira 02962fabda Merge remote-tracking branch 'upstream/features' into merge-master-into-features 2019-01-30 09:37:46 -02:00
Bruno Oliveira b77d168d58 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-01-30 09:37:29 -02:00
Bruno Oliveira c0e6543b5a Fix pytest_report_teststatus call to pass new config object (#4691) 2019-01-30 09:36:54 -02:00
Bruno Oliveira b96e162131
Merge pull request #4693 from asottile/flake8_3_7_0 
fixes for flake8 3.7
 2019-01-30 09:18:09 -02:00
Bruno Oliveira 1dc16ad77b
Merge pull request #4690 from nicoddemus/deprecated-python-summary 
Show deprecation message when running under Python 2.7 and 3.4
 2019-01-30 09:07:59 -02:00
Anthony Sottile acece23697 pre-commit autoupdate 2019-01-29 21:13:32 -08:00
Anthony Sottile e5f823a3a7 fixes for flake8 3.7 2019-01-29 21:11:15 -08:00
Bruno Oliveira b41dc03930
Merge pull request #4691 from nicoddemus/config-terminal-summary-hook 
Add config to pytest_terminal_summary hook
 2019-01-29 21:11:37 -02:00
Bruno Oliveira ade5f2c8c5 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-01-29 19:36:56 -02:00
Bruno Oliveira 3e0e819158
Merge pull request #4280 from blueyed/trace-quit 
pdb: improve quitting from debugger
 2019-01-29 19:14:20 -02:00
Bruno Oliveira eb92e57509 Show deprecation message when running under Python 2.7 and 3.4 
Fix #4627
 2019-01-29 19:02:41 -02:00
Bruno Oliveira 7ad499ad76
Merge pull request #4681 from RonnyPfannschmidt/fix-4680-tmppath-is-tmpdir 
Fix 4680 - `tmp_path` and `tmpdir` now share the same temporary directory
 2019-01-29 19:00:56 -02:00
Ronny Pfannschmidt 2d7582bd92 flip around basetemp folder reset to see if it helps on windows 2019-01-29 18:58:00 +01:00
Bruno Oliveira 7e8e593a45 Add CHANGELOG entry for #4691 2019-01-29 15:52:45 -02:00
Bruno Oliveira 6c3b86369f Add config to pytest_terminal_summary hook 
The docs stated that this hook got the 'config' parameter in 3.5, but the docs
wre probably changed by mistake.
 2019-01-29 15:41:13 -02:00