floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,707 Commits 32 Branches 205 Tags
ecb20b96fcff4e63c37f7ffabb4bd4af8fd2d4d3
Commit Graph

1660 Commits

Author SHA1 Message Date
Bruno Oliveira
df200297e2 Fix internal error when parametrizing using and empty list of ids() 
Fix #1849
 2016-08-23 18:18:46 -03:00
Bruno Oliveira
53a0e2b118 Fix code which guesses parametrized scope based on arguments 
Fix #1832
 2016-08-22 21:05:41 -03:00
Bruno Oliveira
6a8160b318 Add acceptance test for module loader 
Related to #1837
 2016-08-22 17:57:25 -03:00
Florian Bruhin
a20c3f9c44 Merge pull request #1827 from blueyed/Fix-spelling-s-outside-a-outside-of-a- 
Fix spelling: s/outside a/outside of a/
 2016-08-20 20:04:58 +02:00
Daniel Hahler
e306a53999 Fix spelling: s/outside a/outside of a/ 2016-08-20 18:43:39 +02:00
Bruno Oliveira
63dc71c57e Fix regression when using importorskip at module level 
Fix #1822
 2016-08-19 18:21:25 -03:00
Bruno Oliveira
3ba475c0f2 Move internal _is_unittest_unexpected_success_a_failure to "compat" module 
Fix #1815
 2016-08-17 22:50:10 -03:00
Bruno Oliveira
463e6572c5 Merge branch 'master' into merge-master-into-features 
Preparing for 3.0
 2016-08-17 22:39:23 -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
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
Florian Bruhin
789e4670e7 Merge pull request #1813 from nicoddemus/pytest-setup.cfg 
Support [tool:pytest] in setup.cfg files
 2016-08-17 20:33:57 +02:00
Florian Bruhin
c8ab79402c Merge pull request #1811 from nicoddemus/revert-invocation-fixtures 
Revert invocation-fixtures code
 2016-08-17 20:32:54 +02:00
Bruno Oliveira
ab86dea529 Support [tool:pytest] in setup.cfg files 
Also deprecate [pytest] usage in setup.cfg files

Fix #567
 2016-08-17 08:19:38 -03:00
Bruno Oliveira
707b6b5e3f Revert all invocation-fixtures code 
Due to a serious regression found in #1794, it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1
 2016-08-17 08:12:55 -03:00
Bruno Oliveira
f25771a101 Deprecate --resultlog cmdline option 
Fix #830
 2016-08-16 21:40:34 -03:00
Raphael Pierzina
55ec1d7f56 Update test_junitxml.py to interpret XPASS as passed 2016-08-15 23:58:16 +01: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
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
Daniel Hahler
5b95ee3c19 Pass exitstatus to pytest_terminal_summary hook 
This is useful to know if a testrun has been interrupted
(EXIT_INTERRUPTED).
 2016-08-14 22:06:35 +02:00
Raphael Pierzina
14a4dd0697 Extend test to verify longrepr in stdout 2016-08-12 23:31:38 +01:00
Raphael Pierzina
10a6ed1707 Update unittest test to expect failure for an unexpected success 2016-08-12 23:18:02 +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
Floris Bruynooghe
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
Bruno Oliveira
802755ceed Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2016-08-06 17:58:17 -03:00
Daniel Hahler
a2891420de Fix determining rootdir from common_ancestor 2016-08-06 19:35:40 +02:00
Bruno Oliveira
1a79137d04 Add originalname attribute to Function 
Related to #1790
 2016-08-03 22:56:12 -03:00
Bruno Oliveira
ff296fd541 Add capstdout and capstderr attrs to TestReport 
Related to #1790
 2016-08-03 21:49:43 -03:00
Bruno Oliveira
08002ab75a Add longreprtext property to TestReport objects 
Related to #1790
 2016-08-03 21:49:28 -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
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
Ronny Pfannschmidt
48f4e18280 fix deselect tests to match reason removal 2016-08-02 10:43:25 +02: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
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
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
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
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
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