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

5598 Commits

Author SHA1 Message Date
Bruno Oliveira 6759b042b5 Merge pull request #1789 from nicoddemus/regendoc-take-2 
Regendoc take 2
 2016-08-03 18:21:36 -03:00
Bruno Oliveira 8b8c698f1a Add more interpreter versions to multipython example 2016-08-03 16:48:49 -04:00
Bruno Oliveira d28801d794 Make parametrize example deterministic 2016-08-03 16:48:11 -04:00
Bruno Oliveira 72df32f1fd Fix missing print() 2016-08-03 17:34:55 -03:00
Bruno Oliveira 701d5fc727 Regendoc after more fixes on features branch 2016-08-03 16:31:44 -04:00
Bruno Oliveira 6e3105dc8f Merge pull request #1787 from nicoddemus/fix-rewrite-conftest 
Rewrite asserts in test-modules loaded very early in the startup
 2016-08-03 16:10:55 -03:00
Bruno Oliveira 6711b1d6ab Rewrite asserts in test-modules loaded very early in the startup 
Also now match modules which start with any of the names registered
using register_assert_rewrite as discussed in #1787

Fix #1784
 2016-08-03 12:49:48 -03:00
Florian Bruhin d5be6cba13 Merge pull request #1788 from nicoddemus/available-fixtures-sorted 
Sort fixture names when a fixture lookup error occurs
 2016-08-03 07:31:28 +02:00
Bruno Oliveira 277b6d3974 Sort fixture names when a fixture lookup error occurs 2016-08-02 19:45:31 -03:00
Bruno Oliveira ea6191a0cd Merge pull request #1779 from RonnyPfannschmidt/deselect-no-reason 
terminal: dont pretend to know the deselection reason
 2016-08-02 08:38:17 -03:00
Floris Bruynooghe 9540106fe7 Merge pull request #1780 from nicoddemus/regen-pytest30 
Run regen-docs for pytest 3.0
 2016-08-02 12:07:16 +01:00
Ronny Pfannschmidt 1c8fe962f3 add changelog entry 2016-08-02 10:51:10 +02:00
Ronny Pfannschmidt 48f4e18280 fix deselect tests to match reason removal 2016-08-02 10:43:25 +02:00
Bruno Oliveira 21a90c8c50 Run regendoc again 2016-08-01 20:12:00 -04:00
Bruno Oliveira eed21e06db Sort yml items to get same results for regendoc runs 2016-08-01 20:09:35 -04:00
Bruno Oliveira a6b2732507 Pass list of params to pytest.main() in docs 2016-08-01 20:09:35 -04:00
Bruno Oliveira 946466abf4 Run regen-docs for pytest 3.0 2016-08-01 20:09:35 -04:00
Raphael Pierzina 3cd2e37c55 Merge pull request #1783 from nicoddemus/inv-scoped-fixture-msg 
Strip invocation-scope suffix when displaying fixture lookup error
 2016-08-02 01:08:25 +01:00
Bruno Oliveira 553dc2600f Strip invocation-scope suffix when displaying fixture lookup error 2016-08-01 20:34:56 -03:00
Raphael Pierzina 226f2795ba Merge pull request #1782 from nicoddemus/invocation-fixtures-help 
invocation-scoped fixtures show up once with --fixtures
 2016-08-01 23:21:28 +01:00
Bruno Oliveira b380eb5b34 Merge pull request #1781 from nicoddemus/highlight-file-loc 
Highlight the path of file location in error report
 2016-08-01 19:18:52 -03:00
Bruno Oliveira 44ecf2ab2f invocation-scoped fixtures show up once with --fixtures 2016-08-01 18:48:29 -03:00
Bruno Oliveira 31c5194562 Fix broken test in py3k 2016-08-01 18:35:42 -03:00
satoru 3c8222f1db Highlight the path of file location in error report 
So that it's more obvious when we need to copy the file path.
 2016-08-01 17:42:20 -03:00
Ronny Pfannschmidt ac215e9cff terminal: dont pretend to know the deselection reason 
this addresses #1372 - we pretend we know the deselection reason from internal plugins and ignore 3rd party/local reasons
 2016-08-01 13:50:59 +02:00
Bruno Oliveira aa145fa83e Add 'invocation' scope option to fixture docstring 2016-07-29 12:47:30 -03:00
Bruno Oliveira 76fbc6379f Fix deprecated directive in docstring 2016-07-29 12:39:48 -03:00
Bruno Oliveira 80508203b0 Merge pull request #1776 from nicoddemus/pytest-30-version 
Set version to 3.0.0.dev1
 2016-07-28 21:57:13 -03:00
Bruno Oliveira eaf8d9ce19 Set version to 3.0.0.dev1 
For a long time now we've considering the next version to be 3.0.0
 2016-07-28 21:30:16 -03:00
Floris Bruynooghe 510a6083ba Merge pull request #1758 from nicoddemus/deprecated-module 
Add deprecation module to centralize deprecation messages and bits of…
 2016-07-28 22:36:55 +01:00
Florian Bruhin c40dcb3c18 Merge pull request #1768 from ioggstream/1609-fix-description 
fix keep-duplicates help line.
 2016-07-26 11:34:06 +02:00
Roberto Polli 05728d1317 fix keep-duplicates help line. 2016-07-26 09:53:12 +02:00
Florian Bruhin b4ad4cc46e Merge pull request #1767 from nicoddemus/merge-master 
Merge master into features
 2016-07-26 08:44:11 +02:00
Bruno Oliveira c2864aba3d Merge branch 'master' into merge-master 
# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/monkeypatch.py
#	_pytest/python.py
 2016-07-25 19:06:29 -03:00
Bruno Oliveira 9cf09cda7b Remove some comments and improved changelog 2016-07-25 18:41:03 -03:00
Bruno Oliveira eb5b163698 Merge branch '1609-features' of https://github.com/ioggstream/pytest into features 2016-07-25 18:37:55 -03:00
Bruno Oliveira d911bfcb8a Merge branch 'issue634-scopes' of https://github.com/Stranger6667/pytest 
# Conflicts:
#	CHANGELOG.rst
 2016-07-25 18:26:50 -03:00
Bruno Oliveira 8f29ce26e9 Merge branch 'mark_missing_fixture_error' of https://github.com/eolo999/pytest 2016-07-25 18:20:17 -03:00
Bruno Oliveira 6c8b0a28e1 Add deprecation module to centralize deprecation messages and bits of code 2016-07-25 18:14:39 -03:00
Dmitry Dygalo d72afe7e08 Fixed scope override inside metafunc.parametrize. Fixes #634 2016-07-25 12:42:50 +02:00
Roberto Polli ab6aef1d1f feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths. 2016-07-25 12:41:58 +02:00
Florian Bruhin a2b04d02c2 Merge pull request #1759 from Stranger6667/issue1579-invalid-class 
Fixed collection of classes with custom ``__new__`` method. Fixes #1579.
 2016-07-25 12:27:51 +02:00
Dmitry Dygalo f7ad173fee Fixed collection of classes with custom ``__new__`` method 2016-07-25 11:33:37 +02:00
Ronny Pfannschmidt d37af20527 Merge pull request #1765 from The-Compiler/1763-cleanup 
Cleanups for #1763
 2016-07-25 10:31:06 +02:00
Florian Bruhin a309a571d9 Cleanups for #1763 2016-07-25 10:17:46 +02:00
Edoardo Batini e9d729bd46 drop parenthesis around GH issue number 2016-07-25 10:11:37 +02:00
Bruno Oliveira c9a2e611ce Merge pull request #1763 from tomviner/issue1210-exit-msg 
Fix #1210 display msg for early calls to exit
 2016-07-24 13:05:44 -03:00
Bruno Oliveira a24146dd3c Merge pull request #1757 from tramwaj29/improved-message-when-not-using-parametrized-variable 
Improved message when not using parametrized variable
 2016-07-24 13:02:03 -03:00
Bruno Oliveira 7862517c28 Merge pull request #1760 from blueyed/followup-pr1718-remove-newline 
Followup to #1718: style/formatting
 2016-07-24 13:00:14 -03:00
Tom Viner 42adaf5a61 Fix #1210 display msg for early calls to exit 2016-07-24 14:16:34 +02:00