matthiasha
3455dfc804
add missing @matthiasha link
2016-08-19 14:01:07 +02:00
matthiasha
cd39cc1eec
Mention doc update in CHANGELOG
2016-08-19 09:08:11 +02:00
matthiasha
ccfa8d15bf
Update AUTHORS
2016-08-19 09:04:19 +02:00
matthiasha
799dab9dba
Documentation update for rootdir discovery
...
This covers issue https://github.com/pytest-dev/pytest/issues/1435 .
2016-08-19 09:01:12 +02:00
Bruno Oliveira
3e685d6a8d
Merge pull request #1795 from hackebrot/fix-report-outcome-for-xpass
...
WIP Change outcome to 'passed' for xfail unless it's strict
2016-08-17 22:18:06 -03:00
Bruno Oliveira
68ebf552a1
Merge remote-tracking branch 'upstream/master' into fix-report-outcome-for-xpass
2016-08-17 21:55:10 -03:00
Bruno Oliveira
a01cbce662
Merge pull request #1814 from nicoddemus/py35-trial-windows
...
Enable py35-trial testenv on Windows
2016-08-17 21:54:47 -03:00
Bruno Oliveira
0fb34cd2a1
Update CHANGELOG entries
2016-08-17 21:32:07 -03:00
Bruno Oliveira
224ef67374
Quick fix for tests in config depended on the current directory
...
When running those tests from pytest's root folder, they would
fail because they would end up picking pytest's own pytest.ini
2016-08-17 21:32:05 -03:00
Bruno Oliveira
4ed412eb59
unittest's unexpectedSuccess should work as non-strict xpass
...
Make sure tests for that behavior obtain the same return code
using either pytest or unittest to run the same file
2016-08-17 21:32:04 -03:00
Bruno Oliveira
92498109e4
Enable py35-trial testenv on Windows
2016-08-17 21:20:12 -03:00
Raphael Pierzina
dfc659f781
Fix sys.version_info expression in xfail marker
2016-08-17 23:32:56 +01:00
Raphael Pierzina
0173952961
Fix py3 xfail expression evaluation and parametrize strict
2016-08-17 23:15:14 +01:00
Raphael Pierzina
767c28d422
Fix broken test in test_junitxml
2016-08-17 22:32:27 +01:00
Raphael Pierzina
d1f2f779ee
Use a better xfail reason
2016-08-17 22:31:56 +01:00
Raphael Pierzina
bb3d6d87b6
Merge branch 'master' into fix-report-outcome-for-xpass
2016-08-17 22:15:29 +01:00
Raphael Pierzina
018197d72a
Fix broken test in test_skipping and add one for strict xfail
2016-08-17 22:14:51 +01:00
Raphael Pierzina
ea379e0e4f
Fix test in test_junitxml and add one for strict
2016-08-17 22:02:54 +01:00
Raphael Pierzina
55ec1d7f56
Update test_junitxml.py to interpret XPASS as passed
2016-08-15 23:58:16 +01:00
Bruno Oliveira
497152505e
Add CHANGELOG entry for #1809
2016-08-15 19:31:00 -03:00
Bruno Oliveira
ca5957932b
Merge pull request #1806 from blueyed/fix-off-by-one-error-with-warnings
...
Fix off-by-one error with lines from request.node.warn
2016-08-15 19:04:00 -03:00
Bruno Oliveira
d58a8e36d7
Merge pull request #1807 from blueyed/improve-multiline-error-format
...
Improve display of continuation lines with multiline errors
2016-08-15 19:03:35 -03:00
Daniel Hahler
c163cc7937
Improve display of continuation lines with multiline errors
...
Fixes https://github.com/pytest-dev/pytest/issues/717 .
Follow-up to https://github.com/pytest-dev/pytest/pull/1762 .
2016-08-14 22:34:31 +02:00
Daniel Hahler
16cb5d01b1
Fix off-by-one error with lines from request.node.warn
...
The line numbers in `node.location` seem to be zero-based?!
2016-08-14 22:10:01 +02:00
Raphael Pierzina
225341cf2c
Set wasxfail only for xpass w/o strict and else set longrepr
2016-08-13 00:00:51 +01:00
Raphael Pierzina
14a4dd0697
Extend test to verify longrepr in stdout
2016-08-12 23:31:38 +01:00
Raphael Pierzina
296f42a2c9
Treat unittest.expectedFailure pass as a failure
2016-08-12 23:18:36 +01:00
Raphael Pierzina
10a6ed1707
Update unittest test to expect failure for an unexpected success
2016-08-12 23:18:02 +01:00
Bruno Oliveira
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
Christian Boelsen
c4d9c7ea55
Add thanks as requested.
2016-08-08 13:45:10 +01:00
Christian Boelsen
e4028b4505
Fix #1798 to include errors in total tests in junit xml output.
2016-08-08 13:35:49 +01:00
Bruno Oliveira
ac5c39e534
Merge pull request #1796 from nicoddemus/fix-rootdir-common-ancestor
...
Fix rootdir common ancestor
2016-08-06 17:38:42 -03:00
Bruno Oliveira
21230aa017
Add CHANGELOG entry
2016-08-06 17:14:13 -03:00
Dave Hunt
eb08135280
Update documentation to describe expected rootdir behaviour
2016-08-06 19:35:40 +02:00
Daniel Hahler
a2891420de
Fix determining rootdir from common_ancestor
2016-08-06 19:35:40 +02:00
Raphael Pierzina
4fc20d09fe
Change outcome to 'passed' for xfail unless it's strict
2016-08-05 19:25: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
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
Dmitry Dygalo
d72afe7e08
Fixed scope override inside metafunc.parametrize. Fixes #634
2016-07-25 12:42:50 +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