Skip to content

Merge master into features#1816

Merged
nicoddemus merged 34 commits intopytest-dev:featuresfrom
nicoddemus:merge-master-into-features
Aug 18, 2016
Merged

Merge master into features#1816
nicoddemus merged 34 commits intopytest-dev:featuresfrom
nicoddemus:merge-master-into-features

Conversation

@nicoddemus
Copy link
Copy Markdown
Member

@nicoddemus nicoddemus commented Aug 18, 2016

Preparing for the 3.0 release! 😄 💥

Also fixed #1815 while at it.

hackebrot and others added 30 commits August 5, 2016 19:25
@hackebrot
Change outcome to 'passed' for xfail unless it's strict
4fc20d0
Fix pytest-dev#1798 to include errors in total tests in junit xml out…
e4028b4 
…put.
Add thanks as requested.
c4d9c7e
@nicoddemus
Merge pull request pytest-dev#1799 from cryporchild/junitxml-tests-ta…
34925a3 
…lly-fix

Fix pytest-dev#1798 to include errors in total tests in junit xml output.
@hackebrot
Update unittest test to expect failure for an unexpected success
10a6ed1
@hackebrot
Treat unittest.expectedFailure pass as a failure
296f42a
@hackebrot
Extend test to verify longrepr in stdout
14a4dd0
@hackebrot
Set wasxfail only for xpass w/o strict and else set longrepr
225341c
@blueyed
Fix off-by-one error with lines from request.node.warn
16cb5d0 
The line numbers in `node.location` seem to be zero-based?!
@blueyed
Improve display of continuation lines with multiline errors
c163cc7 
Fixes pytest-dev#717.
Follow-up to pytest-dev#1762.
@nicoddemus
Merge pull request pytest-dev#1807 from blueyed/improve-multiline-err…
d58a8e3 
…or-format

Improve display of continuation lines with multiline errors
@nicoddemus
Merge pull request pytest-dev#1806 from blueyed/fix-off-by-one-error-…
ca59579 
…with-warnings

Fix off-by-one error with lines from request.node.warn
@nicoddemus
Add CHANGELOG entry for pytest-dev#1809
4971525
@hackebrot
Update test_junitxml.py to interpret XPASS as passed
55ec1d7
@hackebrot
Fix test in test_junitxml and add one for strict
ea379e0
@hackebrot
Fix broken test in test_skipping and add one for strict xfail
018197d
@hackebrot
Merge branch 'master' into fix-report-outcome-for-xpass
bb3d6d8
@hackebrot
Use a better xfail reason
d1f2f77
@hackebrot
Fix broken test in test_junitxml
767c28d
@hackebrot
Fix py3 xfail expression evaluation and parametrize strict
0173952
@hackebrot
Fix sys.version_info expression in xfail marker
dfc659f
@nicoddemus
Enable py35-trial testenv on Windows
9249810
@nicoddemus
unittest's unexpectedSuccess should work as non-strict xpass
4ed412e 
Make sure tests for that behavior obtain the same return code
using either pytest or unittest to run the same file
@nicoddemus
Quick fix for tests in config depended on the current directory
224ef67 
When running those tests from pytest's root folder, they would
fail because they would end up picking pytest's own pytest.ini
@nicoddemus
Update CHANGELOG entries
0fb34cd
@nicoddemus
Merge pull request pytest-dev#1814 from nicoddemus/py35-trial-windows
a01cbce 
Enable py35-trial testenv on Windows
@nicoddemus
Merge remote-tracking branch 'upstream/master' into fix-report-outcom…
68ebf55 
…e-for-xpass
@nicoddemus
Merge pull request pytest-dev#1795 from hackebrot/fix-report-outcome-…
3e685d6 
…for-xpass

WIP Change outcome to 'passed' for xfail unless it's strict
@nicoddemus
Merge branch 'master' into merge-master-into-features
463e657 
Preparing for 3.0
@nicoddemus
Move internal _is_unittest_unexpected_success_a_failure to "compat" m…
3ba475c 
…odule

Fix pytest-dev#1815
@nicoddemus nicoddemus changed the title Merge master into features Merge master into features 💥 Aug 18, 2016
@nicoddemus nicoddemus changed the title Merge master into features 💥 Merge master into features Aug 18, 2016
@coveralls
Copy link
Copy Markdown

coveralls commented Aug 18, 2016

Coverage Status

Coverage decreased (-0.06%) to 93.015% when pulling 3ba475c on nicoddemus:merge-master-into-features into 789e467 on pytest-dev:features.

@coveralls
Copy link
Copy Markdown

coveralls commented Aug 18, 2016

Coverage Status

Coverage decreased (-0.06%) to 93.015% when pulling 66673c0 on nicoddemus:merge-master-into-features into 789e467 on pytest-dev:features.

@coveralls
Copy link
Copy Markdown

coveralls commented Aug 18, 2016

Coverage Status

Coverage decreased (-0.06%) to 93.015% when pulling 66673c0 on nicoddemus:merge-master-into-features into 789e467 on pytest-dev:features.

@coveralls
Copy link
Copy Markdown

coveralls commented Aug 18, 2016

Coverage Status

Coverage decreased (-0.06%) to 93.015% when pulling 56df9fc on nicoddemus:merge-master-into-features into 789e467 on pytest-dev:features.

@The-Compiler
Copy link
Copy Markdown
Member

The-Compiler commented Aug 18, 2016 •
edited
Loading

Seems like your merge goes back to using py.test instead of pytest in tox.ini for the -trial environments. (Why is it pytest in master though?). LGTM otherwise though I didn't really review the big fixtures.py move.

@nicoddemus
Copy link
Copy Markdown
Member Author

nicoddemus commented Aug 18, 2016

Yep, didn't even notice that I revert to using py.test when I solved the conflict. 😁
Fixed, thanks!

@coveralls
Copy link
Copy Markdown

coveralls commented Aug 18, 2016

Coverage Status

Coverage decreased (-0.06%) to 93.015% when pulling 0334e75 on nicoddemus:merge-master-into-features into 789e467 on pytest-dev:features.

@nicoddemus nicoddemus merged commit 3748112 into pytest-dev:features Aug 18, 2016
@nicoddemus nicoddemus deleted the merge-master-into-features branch August 18, 2016 11:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@nicoddemus @coveralls @The-Compiler @hackebrot @blueyed