floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,387 Commits 32 Branches 205 Tags 46 MiB
Commit Graph

6387 Commits

Author SHA1 Message Date
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 ffb583ae91 Merge pull request #1773 from nicoddemus/fix-freeze 
Use PyInstaller for freeze test env
 2016-07-27 15:06:54 +02:00
Bruno Oliveira ae9d3bf886 Freeze docs: PyInstaller hook and wording 
As discussed during the review, suggest in general
to use PyInstaller and just mention pytest.freeze_includes()
in less detail on how to actually use it, because it varies
from tool to tool.
 2016-07-27 09:15:40 -03:00
Florian Bruhin 7b1520687e Merge pull request #1771 from nicoddemus/sort-links-changelog 
Sort link refs in CHANGELOG
 2016-07-27 06:26:45 +02:00
Florian Bruhin fd765f854c Merge pull request #1772 from nicoddemus/pdf-link 
Fix pdf links in docs and point to docs.pytest.org in README
 2016-07-27 06:25:41 +02:00
Bruno Oliveira ed36d627e4 Use PyInstaller for freeze test env 
cx_freeze doesn't seem to be very well supported in Python 3.5.

Using pyinstaller instead and rename environment to "freeze" which
is a more generic term for freezing python code into standalone
executables.

Fix #1769
 2016-07-26 22:02:37 -03:00
Bruno Oliveira 9a68681719 Point doc links in README to docs.pytest.org 2016-07-26 20:25:55 -03:00
Bruno Oliveira 0b8a91b858 Fix pdf links in the documentation 
Fix #1436
 2016-07-26 20:20:22 -03:00
Bruno Oliveira 5565c1f4ae Sort link refs in CHANGELOG 2016-07-26 20:11:49 -03: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
JJ 4aede6faa6 fixed conflicts 2016-07-24 12:10:32 +02:00
JJ d000f2536a added a test for when the indirect is just a string 2016-07-24 10:47:06 +02:00
Edoardo Batini 0ae77be9f0 Add new target links in CHANGELOG 2016-07-24 00:46:06 +02:00
Daniel Hahler 5c5d7e05f7 Followup to #1718: style/formatting 2016-07-24 00:21:42 +02:00
Edoardo Batini f450e0a1db Thanks to Tom Viner for his guidance during EuroPython2016 sprint 2016-07-24 00:06:16 +02:00
Edoardo Batini fabe8cda2f Thanking myself in CHANGELOG 2016-07-23 23:59:34 +02:00
Edoardo Batini 3c4158ac35 Add changelog entry for this bugfix branch 2016-07-23 23:51:11 +02:00
Edoardo Batini e00199212c Add myself to the AUTHORS 2016-07-23 23:49:44 +02:00
Edoardo Batini e9a67e6702 Adjust test involving FixtureLookupErrorRepr 
I added a starting 'E' to the expected error messages.

The tests were still passing after the previous patch but I think it's
better to have stricter tests.
 2016-07-23 23:45:07 +02:00
Edoardo Batini 6799a47c78 Start FixtureLookupErrorRepr with an 'E' 2016-07-23 23:43:34 +02:00
Bruno Oliveira 655df7f839 Merge pull request #1755 from diegorusso/master 
Testcase for overriding autouse fixture with a parametrized fixture.
 2016-07-23 12:53:24 -03:00
Bruno Oliveira 9891593413 Merge pull request #1754 from hartym/1749_doctest_report_format 
Doctest report format option (#1749)
 2016-07-23 12:52:54 -03:00
JJ bbc7f3a631 updated changelog, resolve #1539 2016-07-23 16:57:49 +02:00
Diego Russo 1704b7d265 Test case for overriding autouse fixtures 
Test case for overriding autouse fixture with a parametrized fixture.
The test covers the problem explained in the issue 1601
Adding Diego Russo to AUTHORS
 2016-07-23 16:53:39 +02:00
JJ 3631719050 added myself to authors 2016-07-23 16:51:55 +02:00