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

5717 Commits

Author SHA1 Message Date
Florian Bruhin cb7c472e34 Merge pull request #1876 from nicoddemus/remove-monkeypatch-invocation-example 
Remove example of "monkeypatch" used in session scope
 2016-08-26 06:15:07 +02:00
Bruno Oliveira a947e83be9 Merge pull request #1870 from AiOO/bugfix/assertion-with-unicode 
Fix UnicodeEncodeError when string comparison with unicode has failed.
 2016-08-25 22:29:32 -03:00
Bruno Oliveira e92d373460 Remove example of "monkeypatch" used in session scope 
This is a leftover when invocation-scoped fixtures
were pulled back.

Fix #1872
 2016-08-25 21:50:57 -03:00
Ahn Ki-Wook 86b8801470 Update AUTHORS and CHANGELOG 2016-08-26 09:42:17 +09:00
Ahn Ki-Wook 856ad719d3 Fix UnicodeEncodeError when string comparison with unicode has failed. 2016-08-26 09:41:40 +09:00
Ronny Pfannschmidt 9c45d6cd83 Merge pull request #1866 from joguSD/bugfix-stdin-stub-buffer 
Add buffer attribute to DontReadFromInput
 2016-08-25 07:07:44 +02:00
Jordan Guymon a152ea2dbb Add buffer attribute to stdin stub 2016-08-24 16:26:34 -07:00
Florian Bruhin 3345ac9216 Merge pull request #1861 from nicoddemus/ids-invalid-type-msg 
Improve error message when passing non-string ids to pytest.mark.parametrize
 2016-08-24 06:43:57 +02:00
Bruno Oliveira 972a5fb5d5 Improve error message when passing non-string ids to pytest.mark.parametrize 
Fix #1857
 2016-08-23 23:31:45 -03:00
Bruno Oliveira ea0febad28 Updates for new patch version 3.0.2 2016-08-23 21:33:57 -03:00
Bruno Oliveira ecb20b96fc Merge pull request #1856 from nicoddemus/release-3.0.1 
Changes for 3.0.1 release
 2016-08-23 21:21:24 -03:00
Bruno Oliveira 49fc4e5e4c Changes for 3.0.1 release 2016-08-23 18:15:43 -04:00
Florian Bruhin 3c866e7080 Merge pull request #1855 from nicoddemus/fix-empty-parametrize-ids 
Fix internal error when parametrizing using and empty list of ids()
 2016-08-23 23:38:27 +02:00
Bruno Oliveira df200297e2 Fix internal error when parametrizing using and empty list of ids() 
Fix #1849
 2016-08-23 18:18:46 -03:00
Ronny Pfannschmidt 7538680c98 Merge pull request #1847 from nicoddemus/parametrize-session-scopes 
Fix code which guesses parametrized scope based on arguments
 2016-08-23 18:03:52 +02:00
Bruno Oliveira 847067fb02 Merge pull request #1851 from adamchainz/deprecated_setup.cfg 
Delete unreferenced setup.cfg from docs
 2016-08-23 12:35:48 -03:00
Adam Chainz 1673667232 Delete unreferenced setup.cfg from docs 
Noticed it's not using the new `[tool:pytest]` header as changed in #567, can't find any reference to it or `testfilepatterns`. It was added in b1e4301457 6 years ago, there don't seem to have ever been references to it.
 2016-08-23 16:08:24 +01:00
Bruno Oliveira 53a0e2b118 Fix code which guesses parametrized scope based on arguments 
Fix #1832
 2016-08-22 21:05:41 -03:00
Bruno Oliveira d99ceb1218 Merge pull request #1844 from nicoddemus/importer-error 
Importer loader error
 2016-08-22 20:47:25 -03:00
Bruno Oliveira b54ea74d4d Update AUTHORS and CHANGELOG for #1837 2016-08-22 17:59:42 -03:00
Bruno Oliveira 6a8160b318 Add acceptance test for module loader 
Related to #1837
 2016-08-22 17:57:25 -03:00
Bruno Oliveira c3148d1d6b Merge pull request #1842 from Stranger6667/doc-fix 
Fix documentation
 2016-08-22 14:11:36 -03:00
Bruno Oliveira b0ede044ac Merge pull request #1835 from RonnyPfannschmidt/mark-extract-param 
mark plugin: move the unclean marked parameter extraction
 2016-08-22 14:11:11 -03:00
Dmitry Dygalo 3fbf2e7a80 Fix documentation 2016-08-22 18:38:02 +02:00
Florian Bruhin af0ec120fe Merge pull request #1836 from asvetlov/patch-1 
Remove duplicated name
 2016-08-21 22:09:58 +02:00
Marcin Bachry 678750c8f8 Fix importer call 2016-08-21 22:07:18 +02:00
Andrew Svetlov 4e9c1fbe96 Remove duplicated name 2016-08-21 22:20:29 +03:00
Ronny Pfannschmidt 406777d104 mark plugin: move the unclean marked parameter extraction 2016-08-21 20:44:37 +02:00
Florian Bruhin abe8f5e23f Merge pull request #1824 from nicoddemus/update-howtorelease 
Update HOWTORELEASE based on the 3.0.0 release
 2016-08-20 23:03:59 +02:00
Bruno Oliveira 6a0e849067 Update HOWTORELEASE based on the 3.0.0 release 2016-08-20 15:47:34 -03:00
Florian Bruhin a20c3f9c44 Merge pull request #1827 from blueyed/Fix-spelling-s-outside-a-outside-of-a- 
Fix spelling: s/outside a/outside of a/
 2016-08-20 20:04:58 +02:00
Florian Bruhin 783aff17dd Merge pull request #1828 from blueyed/minor-s-no-pkg_resources-pkg_resources- 
minor: s/no pkg_resources/pkg_resources/
 2016-08-20 20:04:48 +02:00
Daniel Hahler 86ec3f37af minor: s/no pkg_resources/pkg_resources/ 2016-08-20 18:47:42 +02:00
Daniel Hahler e306a53999 Fix spelling: s/outside a/outside of a/ 2016-08-20 18:43:39 +02:00
Florian Bruhin 90fb8cb08b Merge pull request #1823 from nicoddemus/importorskip-regression 
Fix regression when using importorskip at module level
 2016-08-20 18:37:14 +02:00
Bruno Oliveira 5129c2f867 Merge pull request #1826 from blueyed/Remove-duplicate-entry-for-#717-in-CHANGELOG 
Remove duplicate entry for #717 in CHANGELOG
 2016-08-20 11:21:53 -03:00
Daniel Hahler 87d2d1d838 Remove duplicate entry for #717 in CHANGELOG 2016-08-20 15:12:08 +02:00
Bruno Oliveira 9aec8d9a47 py.test team -> Pytest team :) 2016-08-19 18:59:13 -03:00
Bruno Oliveira c8f53d6690 Fix typo in 3.0.0 release announcement 2016-08-19 18:58:14 -03:00
Bruno Oliveira 875bcd4224 Add 3.0.0 release announcement to index.rst 2016-08-19 18:30:11 -03:00
Bruno Oliveira 63dc71c57e Fix regression when using importorskip at module level 
Fix #1822
 2016-08-19 18:21:25 -03:00
Bruno Oliveira 3a200b75c9 Bump version to 3.0.1.dev 2016-08-19 17:41:45 -03:00
Bruno Oliveira 745c8c17f1 Merge remote-tracking branch 'upstream/master' 2016-08-19 17:38:21 -03:00
Bruno Oliveira 5ecf3d78f1 Merge pull request #1819 from matthiasha/patch-1 
Documentation update for rootdir discovery
 2016-08-19 17:36:44 -03:00
Bruno Oliveira b85a3b0d71 Merge pull request #1820 from The-Compiler/changelog-duplicates 
Remove duplicate CHANGELOG messages
 2016-08-19 17:35:23 -03:00
Bruno Oliveira 8777f61e7b Merge pull request #1818 from nicoddemus/release-3.0 
Release 3.0
 2016-08-19 17:33:15 -03:00
Florian Bruhin 31ede2432c Remove duplicate CHANGELOG messages 
Those are both already mentioned in the breaking changes at the top.
 2016-08-19 17:05:02 +02:00
matthiasha c8fbf3ae34 remove dot in pytest 2016-08-19 14:02:25 +02:00
matthiasha 3455dfc804 add missing @matthiasha link 2016-08-19 14:01:07 +02:00
matthiasha cd39cc1eec Mention doc update in CHANGELOG 2016-08-19 09:08:11 +02:00