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

1685 Commits

Author SHA1 Message Date
Matthew Duck
0061d9bd3d Fix flake8 (unused import, trailng whitespace) 2016-10-11 00:17:15 +01:00
Matthew Duck
b629da424e Restructure truncation of assertion messages 
This addresses ref https://github.com/pytest-dev/pytest/issues/1954.

The current truncation for assertion explanations does not deal with long lines
properly:

- Previously if lines were too long it would display a "-n more lines"
  message.

- 999e7c6541 introduced a bug where long lines can
  cause index errors if there are < 10 lines.

Extract the truncation logic into its own file and ensure it can deal with
long lines properly.
 2016-10-10 23:38:27 +01:00
Bruno Oliveira
654af0ba25 Merge remote-tracking branch 'upstream/master' into features 2016-09-26 19:32:53 -03:00
Bruno Oliveira
5e96edd435 Merge pull request #1952 from davidszotten/pdbcls_without_pdb_on_fail 
Pdbcls without pdb on fail
 2016-09-25 20:24:45 -03:00
Tyler Goodlet
6db2f315fa Explain a bad scope value to the user 2016-09-21 16:40:58 -04:00
David Szotten
d75748ef6f test for calling set_trace with custom pdb cls 2016-09-21 09:45:26 +00:00
David Szotten
c7b4b8cf6f test 2016-09-21 09:45:23 +00:00
Lev Maximov
8cba033bbb added a test 2016-09-20 02:47:59 +07:00
Floris Bruynooghe
887c097f8e Merge pull request #1951 from mattduck/feat/1512-dict-compare-output 
Feat/1512 dict compare output
 2016-09-19 17:34:09 +01:00
Floris Bruynooghe
01db0f1cd1 Merge pull request #1923 from RonnyPfannschmidt/mark-internal-value 
use consistent inner repressentation for marks
 2016-09-19 15:30:22 +01:00
Matthew Duck
dd64d823b9 Don't display dict common items if verbosity=1 
Part one of https://github.com/pytest-dev/pytest/issues/1512.

If verbosity=1, assertion explanations are truncated at 10 lines. In this
situation, it's more important to tell the user which dictionary items are
different than which are the same.
 2016-09-19 15:27:28 +01:00
Floris Bruynooghe
dc16fe2bb9 Merge junit-xml url attribute branch 
Merge branch 'url_attr' of https://github.com/fushi/pytest into junitxml-url
 2016-09-19 12:57:05 +01:00
Bruno Oliveira
04cf5e1df4 Fixed assertion rewriting for plugins in development mode 
Fix #1934
 2016-09-14 21:59:33 -03:00
Ronny Pfannschmidt
10094a3f09 use consistent inner repressentation for marks 2016-09-08 09:52:22 +02:00
Ronny Pfannschmidt
1c9bd9278e Merge pull request #1913 from flub/builtin-assertion 
Remove BuiltinAssertionError
 2016-09-05 16:53:13 +02:00
Floris Bruynooghe
28b1896e9a Remove BuiltinAssertionError 
We used to have this when we where patching the real Python
AssertionError for use with reinterpret, but reinterpret is now
gone so we no longer need this as it is not used by rewrite.
 2016-09-05 15:29:09 +02:00
Bruno Oliveira
1e10de574d The "ids" argument to "parametrize" again accepts unicode strings in Python 2 
Fixes #1905
 2016-09-02 18:38:15 -03:00
mbyt
696a9112be integrating review commets of @nicoddemus 
plus small scale refactoring
 2016-08-31 22:33:47 +02:00
mbyt
be08223d5a Merge branch 'master' into disable_tearDown_and_cleanups_for_post_mortem_debugging 
Conflicts:
	CHANGELOG.rst
 2016-08-31 20:35:31 +02:00
mbyt
10b3274924 adding corresponding test, authors and changelog 2016-08-31 20:22:54 +02:00
Bruno Oliveira
c8a366e551 Fix issue where pytest_plugins as string was marking wrong modules for rewrite 
Fix #1888
 2016-08-30 22:53:50 -03:00
Ahn Ki-Wook
856ad719d3 Fix UnicodeEncodeError when string comparison with unicode has failed. 2016-08-26 09:41:40 +09:00
John Towler
1b259f70f3 Testcase reports with a url attribute will now properly write this to junitxml 2016-08-25 13:08:51 -07:00
Jordan Guymon
a152ea2dbb Add buffer attribute to stdin stub 2016-08-24 16:26:34 -07:00
Bruno Oliveira
972a5fb5d5 Improve error message when passing non-string ids to pytest.mark.parametrize 
Fix #1857
 2016-08-23 23:31:45 -03:00
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