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

7330 Commits

Author SHA1 Message Date
Jurko Gospodnetić f0bfe9de3d shorten some test code 2017-12-09 13:34:56 +01:00
Jurko Gospodnetić 596937e610 remove extra whitespace 2017-12-09 13:34:55 +01:00
Jurko Gospodnetić 57fcd3f57e remove corpse code comments 2017-12-09 13:34:55 +01:00
Jurko Gospodnetić 65f5383106 fix comment & docstring typos, line wrapping & wording 2017-12-09 13:34:54 +01:00
Ronny Pfannschmidt 964c29cb93
Merge pull request #3014 from nicoddemus/cap-named-tuple 
Change capture docs to use namedtuple
 2017-12-09 09:38:39 +01:00
Bruno Oliveira 38fb6aae78 Change capture docs to use namedtuple 2017-12-08 18:34:29 -02:00
Bruno Oliveira 1c5b887dfd
Fix spelling of pytest in CHANGELOG 2017-12-08 09:04:42 -02:00
Thomas Hisch ba209b5230 Integrate logging_using_handler into catching_logs 
logging_using_handler is only used in catching_logs. Therefore it makes
sense to remove one of the many context managers from the logging
plugin.
 2017-12-07 16:34:53 +01:00
Henk-Jaap Wagenaar b62fd79c0c Fix issue 2985. 2017-12-07 15:12:44 +00:00
Bruno Oliveira 655146e522 Merge remote-tracking branch 'upstream/master' into features 2017-12-05 22:30:35 -02:00
Bruno Oliveira 88f2cc9b64
Small formatting fixes in CHANGELOG 2017-12-05 22:28:56 -02:00
Bruno Oliveira ed2bb9d723
Merge pull request #2997 from nicoddemus/release-3.3.1 
Preparing release version 3.3.1
 2017-12-05 22:21:41 -02:00
Bruno Oliveira 2a111ff700 Preparing release version 3.3.1 2017-12-05 20:41:57 +00:00
Bruno Oliveira 5c6758fde4
Merge pull request #3006 from The-Compiler/template-fix 
Fix example in PR template
 2017-12-05 18:35:42 -02:00
Bruno Oliveira 9bd8420a6b
Merge pull request #3005 from The-Compiler/blacklist-catchlog 
Also blacklist pytest-capturelog plugin
 2017-12-05 18:35:09 -02:00
Florian Bruhin cbdab02d05 Fix example in PR template 2017-12-05 20:05:35 +01:00
Florian Bruhin ce30896cd2 Also blacklist pytest-capturelog plugin 
This is the older plugin before pytest-catchlog was around. Apparently there are
people still using it.

Fixes #3004
 2017-12-05 20:02:56 +01:00
Ronny Pfannschmidt 2e8b0a83fe
Merge pull request #2989 from nicoddemus/bring-tr-writer-back-2984 
Bring back TerminalReporter.writer as an alias to TerminalReporter._tw
 2017-12-01 17:42:31 +01:00
Bruno Oliveira 369c711f14
Merge pull request #2971 from blueyed/fix-ZeroDivisionError 
Fix ZeroDivisionError with 0 collected tests
 2017-11-30 21:12:46 -02:00
Bruno Oliveira cf0cac3b73 Bring back TerminalReporter.writer as an alias to TerminalReporter._tw 
Fix #2984
 2017-11-30 19:56:47 -02:00
Bruno Oliveira a9dd37f429
Merge pull request #2980 from nicoddemus/immutable-fix-parameters 
Add CHANGELOG entry about pytest.fixture "params" being now immutable
 2017-11-30 19:56:03 -02:00
Bruno Oliveira 294729962d
Merge pull request #2976 from st--/master 
Extend _pytest.python._idval to return __name__ of functions as well
 2017-11-30 18:01:21 -02:00
Ronny Pfannschmidt 4de433e280
Merge pull request #2983 from nicoddemus/improve-assert-2979 
Improve getscopeitem assertion message
 2017-11-30 16:58:29 +01:00
ST John 652936f47f make linter happier 2017-11-30 10:29:05 +00:00
ST John 1fe2e2cb03 Merge branch 'master' of https://github.com/st--/pytest 2017-11-30 10:19:38 +00:00
ST John e66473853c add test 2017-11-30 10:19:29 +00:00
Bruno Oliveira 70f1e3b4b0 Improve getscopeitem assertion message 
Fix #2979
 2017-11-30 07:53:43 -02:00
Bruno Oliveira fdd4abb88a
Small rewording of the CHANGELOG 2017-11-29 21:11:34 -02:00
Bruno Oliveira fdfc1946da Add CHANGELOG entry about pytest.fixture "params" being now immutable 
Fix #2959
 2017-11-29 18:56:57 -02:00
ST John 5085aa2bce add changelog file 2017-11-29 16:30:34 +00:00
ST John 912330a7e2 Extend _pytest.python._idval to return __name__ of functions as well, not just for classes 2017-11-29 16:17:49 +00:00
Florian Bruhin 88ed1ab648
Merge pull request #2964 from rpuntaie/master 
fix issue #2920
 2017-11-29 10:32:28 +01:00
Florian Bruhin 191e8c6d9b
Merge pull request #2969 from nicoddemus/null-bytes-2957 
Always escape null bytes when setting PYTEST_CURRENT_TEST
 2017-11-29 06:57:48 +01:00
Bruno Oliveira 6bbd741039 Add test for #2971 2017-11-28 22:42:52 -02:00
Daniel Hahler 0f5fb7ed05 Fix ZeroDivisionError with 0 collected tests 
This can easily happen with pytest-testmon.
 2017-11-29 00:54:14 +01:00
Bruno Oliveira 5f1a7330b2 Small fixes in changelog items 2017-11-28 21:36:17 -02:00
Bruno Oliveira 2a75ae46c3 Improve test that blocks setuptools plugins from being loaded 
Make it a parametrized test to ensure all the mocked mechanisms in
the test actually work as expected when we *do not* use "-p no:"
 2017-11-28 21:29:58 -02:00
Bruno Oliveira 89cf943e04 Always escape null bytes when setting PYTEST_CURRENT_TEST 
Fix #2957
 2017-11-28 19:45:13 -02:00
Roland Puntaier 833f33fa0c removed comments 2017-11-28 17:38:49 +01:00
Roland Puntaier 3dbac17d75 Merge branch 'master' of https://github.com/rpuntaie/pytest 2017-11-28 17:30:54 +01:00
Roland Puntaier 6843d45c51 added test for #2920 fix 2017-11-28 17:29:52 +01:00
Bruno Oliveira 4a840a7c09
Fix formatting in CHANGELOG 2017-11-28 13:59:27 -02:00
Roland Puntaier 9b7e4ab0c6 prepare pull request for #2920 fix 2017-11-28 16:56:59 +01:00
Roland Puntaier 4ea7bbc197 fix issue #2920 2017-11-28 16:47:12 +01:00
Bruno Oliveira 4d2f05e4b9
Merge pull request #2962 from pytest-dev/fix-nbsp-in-changelog 
replace non-breaking space with space
 2017-11-28 09:51:26 -02:00
Florian Bruhin 454b60b6c5
Merge pull request #2963 from redtoad/patch-1 
Fix broken link to project
 2017-11-28 12:51:15 +01:00
Sebastian Rahlf f6be23b68b Add changelog entry. 2017-11-28 12:31:34 +01:00
Sebastian Rahlf 644fdc5237
Fix broken link to project 
The plugin has since moved to pytest-dev
 2017-11-28 12:22:47 +01:00
Tom Viner 4b5f0d5ffa
replace non-breaking space with space 2017-11-28 11:12:40 +00:00
Ronny Pfannschmidt 9f7ba00611
Merge pull request #2958 from nicoddemus/issue-2956 
Only escape str-like arguments passed to warnings
 2017-11-28 07:44:28 +01:00