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

3948 Commits

Author SHA1 Message Date
Floris Bruynooghe 220d177e76 Close branch issue660 
--HG--
branch : issue660
 2015-04-13 00:00:40 +01:00
holger krekel 236cac86b1 add me as author of PR 
--HG--
branch : issue660
 2015-04-04 16:36:32 +02:00
holger krekel 79c0515945 merge pytest-2.7 branch 
--HG--
branch : issue660
 2015-04-04 16:35:14 +02:00
holger krekel 0e916460d8 add changelog entries 
--HG--
branch : pytest-2.7
 2015-04-04 16:29:38 +02:00
holger krekel 69a0eacb4f Close branch release-checklist 
--HG--
branch : release-checklist
 2015-04-04 16:27:07 +02:00
holger krekel 7f05cd8bfc more streamlining of release checklist 
--HG--
branch : release-checklist
 2015-04-02 10:55:24 +02:00
holger krekel b55d66d0cf - avoid setting of versions and targets in conf.py and Makefile 
as discussed on pytest-dev

- "make help" now prints pytest specific information.

- add a "_getdoctarget.py" helper

- make ``setup.py`` read the version from ``_pytest/__init__.py``

--HG--
branch : release-checklist
 2015-04-02 10:38:25 +02:00
holger krekel 3ed3e51997 fix issue660: properly report fixture scope mismatches independent 
from fixture argument ordering.

--HG--
branch : issue660
 2015-04-01 18:42:48 +02:00
holger krekel 81d7883884 refine release process according to Bruno's feedback 
--HG--
branch : release-checklist
 2015-03-27 09:27:31 +01:00
holger krekel ad137d46a2 add a release checklist 
--HG--
branch : release-checklist
 2015-03-26 14:04:33 +01:00
holger krekel e16983d265 bump versions to dev, including changing the doc-install target to "dev" 
instead of "latest"
 2015-03-26 13:48:59 +01:00
holger krekel fd6ff9bc01 Added tag 2.7.0 for changeset 7ed701fa2fb5 2015-03-26 13:44:58 +01:00
holger krekel d2a8866bce bump verrsion to python2.7, fix a too precise test for windows, regen docs 2015-03-26 09:34:10 +01:00
Anatoly Bubenkov c69978fbb0 revert verbosity 2015-03-24 13:41:49 +01:00
Anatoly Bubenkov c1eaa72883 correct config 2015-03-24 11:56:59 +01:00
Anatoly Bubenkov 55f3ffd2ba add verbosity to the tests 2015-03-24 10:51:45 +00:00
Anatoly Bubenkov 55eb82c434 fix pep257 2015-03-23 21:28:29 +01:00
Anatoly Bubenkov d94a29e866 merge almarklein/default 2015-03-23 21:25:10 +01:00
Anatoly Bubenkov a7d2a82caa merge pfctdayelise/issue463 2015-03-23 20:42:16 +01:00
Anatoly Bubenkov ce95437dee merge with default 
--HG--
branch : issue463
 2015-03-23 20:41:27 +01:00
Brianna Laugher 3ba3112a85 update changelog 
--HG--
branch : issue463
 2015-03-23 20:28:04 +01:00
Brianna Laugher c019e489d2 Change docstring style 
--HG--
branch : issue463
 2015-03-23 20:27:53 +01:00
Brianna Laugher 43e4fcf6dd Raise specific MarkerError rather than generic ValueError 
--HG--
branch : issue463
 2015-03-23 20:01:58 +01:00
tigeraniya 65ca554230 duplicate assignment 2015-03-23 20:47:34 +05:30
holger krekel 52a2999a91 merge 2015-03-23 10:10:26 +01:00
holger krekel f3580bee2d fix issue435: make reload() work when assert rewriting is active. 
Thanks Daniel Hahler.
 2015-03-23 10:08:47 +01:00
Brianna Laugher deb163d237 Change string format syntax from {} to {0} for py2.6 
--HG--
branch : issue463
 2015-03-21 23:57:06 +01:00
Brianna Laugher 6f81602ba2 Use hasattr instead of try/except 
--HG--
branch : issue463
 2015-03-21 23:30:13 +01:00
Brianna Laugher ac17f20d98 #463 
Raise a ValueError early if user misspells 'parametrize' as 'parameterize'.

--HG--
branch : issue463
 2015-03-21 23:06:25 +01:00
Almar Klein a9b7de8bf0 address reviewer comments 2015-03-21 17:26:23 +01:00
Almar Klein 0fc75c9622 Storing sys.last_traceback: test, docs and changelog 2015-03-21 17:06:24 +01:00
Almar Klein 9726fafa98 allow postmortem debugging on failed test 2015-03-21 09:26:35 +01:00
Floris Bruynooghe cf7bb70809 Mention requirement for licensing information 
Repositories should always have proper licensing information.
 2015-03-19 11:53:32 +00:00
holger krekel 03c3930734 add a project someone reported a while ago 2015-03-17 13:21:44 +01:00
holger krekel 25a4d7d882 remove default-verbose running 2015-03-17 13:19:26 +01:00
Bruno Oliveira eead0365b5 Merged in parametrized-fixture-override (pull request #257) 
allow to override parametrized fixtures with non-parametrized ones and vice versa
 2015-03-12 09:40:56 -03:00
Bruno Oliveira eb3b989286 Close branch parametrized-fixture-override 
--HG--
branch : parametrized-fixture-override
 2015-03-12 09:40:56 -03:00
Anatoly Bubenkov cdb46e9f16 Merged in blueyed/pytest/strip-docstrings-from-fixtures (pull request #260) 
Strip docstrings in output with `--fixtures`
 2015-03-12 08:12:43 +01:00
Anatoly Bubenkov ead25634fe Merged in link-update (pull request #261) 
update website sidebar links for repo move
 2015-03-12 08:11:46 +01:00
Anatoly Bubenkov 3f3521c826 Close branch link-update 
--HG--
branch : link-update
 2015-03-12 08:11:46 +01:00
Benjamin Peterson 0c2dfb9683 update website sidebar links for repo move 
--HG--
branch : link-update
 2015-03-11 20:04:14 -05:00
Daniel Hahler 5d6b0a59c0 Strip docstrings in output with `--fixtures` 
Fixes https://bitbucket.org/pytest-dev/pytest/issue/550.

--HG--
branch : strip-docstrings-from-fixtures
 2015-03-04 17:00:24 +01:00
Daniel Hahler c629f6b18b Fix `reload()` with modules handled via `python_files` 
If a module exists in `sys.modules` already, `load_module` has to return it.

Fixes https://bitbucket.org/pytest-dev/pytest/issue/435

--HG--
branch : fix-reload
 2015-03-04 16:21:27 +01:00
Anatoly Bubenkov b48eda6d7d update regendocs 
--HG--
branch : parametrized-fixture-override
 2015-03-02 22:07:42 +01:00
Anatoly Bubenkov 81243657be add docs target 
--HG--
branch : parametrized-fixture-override
 2015-03-02 21:43:31 +01:00
Anatoly Bubenkov 24fe051803 use make develop in contribution guide 
--HG--
branch : parametrized-fixture-override
 2015-03-02 20:48:09 +01:00
Anatoly Bubenkov 16bcfa749e merge with upstream 
--HG--
branch : parametrized-fixture-override
 2015-03-02 20:18:31 +01:00
Anatoly Bubenkov d083153548 fix typo 
--HG--
branch : parametrized-fixture-override
 2015-03-02 20:18:06 +01:00
Ronny Pfannschmidt 41e6b04f0b Merged in eks/pytest/issue616 (pull request #258) 
Add comments
 2015-03-02 14:38:10 +01:00
Anatoly Bubenkov 33c2a3a3e5 make loop more readable 
--HG--
branch : parametrized-fixture-override
 2015-03-02 08:55:57 +01:00