296f42a2c9
Treat unittest.expectedFailure pass as a failure
2016-08-12 23:18:36 +01:00
10a6ed1707
Update unittest test to expect failure for an unexpected success
2016-08-12 23:18:02 +01:00
34925a31a9
Merge pull request #1799 from cryporchild/junitxml-tests-tally-fix
...
Fix #1798 to include errors in total tests in junit xml output.
2016-08-08 10:43:38 -03:00
c4d9c7ea55
Add thanks as requested.
2016-08-08 13:45:10 +01:00
e4028b4505
Fix #1798 to include errors in total tests in junit xml output.
2016-08-08 13:35:49 +01:00
99a4a1a784
Merge pull request #1791 from nicoddemus/ide-integration-1790
...
Internal adjustments for easier integration with IDEs
2016-08-07 23:50:50 +01:00
4ab2e57ebd
Merge pull request #1797 from nicoddemus/merge-master-into-features
...
Merge master into features
2016-08-06 18:48:40 -03:00
802755ceed
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2016-08-06 17:58:17 -03:00
ac5c39e534
Merge pull request #1796 from nicoddemus/fix-rootdir-common-ancestor
...
Fix rootdir common ancestor
2016-08-06 17:38:42 -03:00
21230aa017
Add CHANGELOG entry
2016-08-06 17:14:13 -03:00
eb08135280
Update documentation to describe expected rootdir behaviour
2016-08-06 19:35:40 +02:00
a2891420de
Fix determining rootdir from common_ancestor
2016-08-06 19:35:40 +02:00
4fc20d09fe
Change outcome to 'passed' for xfail unless it's strict
2016-08-05 19:25:55 +01:00
1a79137d04
Add originalname attribute to Function
...
Related to #1790
2016-08-03 22:56:12 -03:00
530b0050b4
Improve TestReport.sections docs a bit
...
Related to #1790
2016-08-03 21:57:58 -03:00
ff296fd541
Add capstdout and capstderr attrs to TestReport
...
Related to #1790
2016-08-03 21:49:43 -03:00
08002ab75a
Add longreprtext property to TestReport objects
...
Related to #1790
2016-08-03 21:49:28 -03:00
6759b042b5
Merge pull request #1789 from nicoddemus/regendoc-take-2
...
Regendoc take 2
2016-08-03 18:21:36 -03:00
8b8c698f1a
Add more interpreter versions to multipython example
2016-08-03 16:48:49 -04:00
d28801d794
Make parametrize example deterministic
2016-08-03 16:48:11 -04:00
72df32f1fd
Fix missing print()
2016-08-03 17:34:55 -03:00
701d5fc727
Regendoc after more fixes on features branch
2016-08-03 16:31:44 -04:00
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
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
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
277b6d3974
Sort fixture names when a fixture lookup error occurs
2016-08-02 19:45:31 -03:00
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
9540106fe7
Merge pull request #1780 from nicoddemus/regen-pytest30
...
Run regen-docs for pytest 3.0
2016-08-02 12:07:16 +01:00
1c8fe962f3
add changelog entry
2016-08-02 10:51:10 +02:00
48f4e18280
fix deselect tests to match reason removal
2016-08-02 10:43:25 +02:00
21a90c8c50
Run regendoc again
2016-08-01 20:12:00 -04:00
eed21e06db
Sort yml items to get same results for regendoc runs
2016-08-01 20:09:35 -04:00
a6b2732507
Pass list of params to pytest.main() in docs
2016-08-01 20:09:35 -04:00
946466abf4
Run regen-docs for pytest 3.0
2016-08-01 20:09:35 -04:00
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
553dc2600f
Strip invocation-scope suffix when displaying fixture lookup error
2016-08-01 20:34:56 -03:00
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
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
44ecf2ab2f
invocation-scoped fixtures show up once with --fixtures
2016-08-01 18:48:29 -03:00
31c5194562
Fix broken test in py3k
2016-08-01 18:35:42 -03:00
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
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
aa145fa83e
Add 'invocation' scope option to fixture docstring
2016-07-29 12:47:30 -03:00
76fbc6379f
Fix deprecated directive in docstring
2016-07-29 12:39:48 -03:00
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
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
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
ffb583ae91
Merge pull request #1773 from nicoddemus/fix-freeze
...
Use PyInstaller for freeze test env
2016-07-27 15:06:54 +02:00
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
7b1520687e
Merge pull request #1771 from nicoddemus/sort-links-changelog
...
Sort link refs in CHANGELOG
2016-07-27 06:26:45 +02:00
Raphael Pierzina
Bruno Oliveira
Christian Boelsen
Floris Bruynooghe
Dave Hunt
Daniel Hahler
Florian Bruhin
Ronny Pfannschmidt
satoru