p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,131 Commits 5 Branches 0 Tags 36 MiB
Commit Graph

4131 Commits

Author SHA1 Message Date
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
Eric Siegerman 97d5da5c99 Add comments 
--HG--
branch : issue616
 2015-03-01 17:32:00 -05:00
Anatoly Bubenkov d1005ebb8f document fixture override techniques 
--HG--
branch : parametrized-fixture-override
 2015-03-01 18:54:24 +01:00
Anatoly Bubenkov c4623939af support override of the parametrized fixture on the test level 
--HG--
branch : parametrized-fixture-override
 2015-03-01 15:15:37 +01:00
Anatoly Bubenkov 060609317a allow to override parametrized fixtures with non-parametrized ones and vice versa 
--HG--
branch : parametrized-fixture-override
 2015-03-01 13:54:43 +01:00
Anatoly Bubenkov bae0f7f46a Merged in plugincompat-move (pull request #256) 
moved pytest-plugs to plugincompat
 2015-02-28 21:32:57 +01:00
Anatoly Bubenkov 09a50b6e6d Close branch plugincompat-move 
--HG--
branch : plugincompat-move
 2015-02-28 21:32:57 +01:00
Bruno Oliveira 200fe072f1 moved pytest-plugs to plugincompat 
also plugins_index is ready for 2.7.0 release

--HG--
branch : plugincompat-move
 2015-02-28 17:22:42 -03:00
holger krekel ff9ec13ddb mention "pytestdotorg" twitter account 2015-02-28 20:02:31 +01:00
Ronny Pfannschmidt 9384ff38c9 Close branch issue616 
--HG--
branch : issue616
 2015-02-28 10:02:58 +01:00
Ronny Pfannschmidt 1e6e373913 Merged in issue616 (pull request #252) 
fix issue616 - conftest visibility fixes.
 2015-02-28 10:02:58 +01:00
holger krekel e510eb0d45 a few more fixes 2015-02-27 16:42:03 +01:00
holger krekel 2e2d6a8bef make "Adopt pytest" note more prominent, fix link from plugins page. 2015-02-27 15:49:25 +01:00
Benjamin Peterson 44cd1c9862 merge dead branch 2015-02-27 09:34:33 -05:00
Benjamin Peterson f6f084fa01 close branch 
--HG--
branch : update-issues
 2015-02-27 09:34:16 -05:00
holger krekel b7d212c0c9 Merged in update-issues (pull request #255) 
another update for get_issues.py to account for repository move
 2015-02-27 15:32:13 +01:00
Benjamin Peterson bda3e53df6 another update for get_issues.py to account for repository move 
--HG--
branch : update-issues
 2015-02-27 09:12:00 -05:00
Anatoly Bubenkov 9d4354c0a4 Merged in docs_community (pull request #254) 
added documentationo on the new pytest-dev teams on bitbucket and
 2015-02-27 14:58:27 +01:00