c49863aa63
merge next chunk from master and fix changelog linting issue
2016-05-13 19:36:47 +02:00
01d2ff804b
Merge commit '56156bb119194014129ac08c4a2c370f0b893104' into merge-master
2016-05-13 17:55:02 +02:00
68f658b6cc
Merge commit '890c2fa555314a67a8d97a1b8ea4881a14be69c4' into merge-master
2016-05-13 17:52:59 +02:00
4bde70d060
Merge commit 'ec62a3c9e47c3b5b07aa1656815145ffa2882a09' into merge-master
2016-05-13 17:40:14 +02:00
8a94c66e68
Merge pull request #1551 from fushi/master
...
Fix #1549 - count skips in junit-xml
2016-05-05 22:03:30 +02:00
0d07b64571
Fixes Issue 1549
2016-05-05 11:29:05 -07:00
98dd2ce75c
document reason for #1540
2016-04-28 16:22:31 +02:00
308e76e19c
add xfailing test for #1540
2016-04-28 16:11:30 +02:00
60212e8831
Merge pull request #1537 from ben4ever/patch-1
...
Fix typo in doc
2016-04-27 22:13:51 -07:00
75abfbe8d4
Fix typo in doc
2016-04-28 14:40:17 +10:00
6cc56b4a1b
Merge pull request #1535 from palaviv/parametrize-test-ids-hook
...
introduce pytest_make_parametrize_id hook
2016-04-27 16:16:16 +02:00
9733127951
pytest_make_parametrize_id receive config object
2016-04-26 10:23:57 +03:00
fdee88f086
Merge pull request #1520 from omarkohl/invalid_test_module_name
...
Raise CollectError if import test module fails
2016-04-25 21:42:41 -03:00
53429ed8b8
Added hook to plugin docs and new CHANGELOG record
2016-04-25 18:03:34 +03:00
b9faf78d51
Added test_pytest_make_parametrize_id
2016-04-25 17:48:28 +03:00
79927428d1
Added pytest_make_parametrize_id hook
2016-04-25 17:11:47 +03:00
56855893ca
Raise CollectError if import test module fails
...
One of the reasons for failing to import the test module is invalid Python
identifiers in the full package path of the test module.
fix #1426
2016-04-23 13:50:48 +02:00
52babba33e
Update sprint 2016
2016-04-23 08:56:28 +02:00
8552860a9b
Merge pull request #1532 from RibeiroAna/features
...
Update sprint2016.rst :)
2016-04-23 01:05:25 -03:00
f02f72e651
Update sprint2016.rst
2016-04-23 00:11:44 -03:00
6d661ace0a
Merge pull request #1523 from MengJueM/master
2016-04-20 16:55:31 +02:00
f51c34ef31
Add changelog
2016-04-20 22:32:35 +08:00
b220c96bf8
Merge pull request #1526 from The-Compiler/tracebackhide
...
Filter selectively with __tracebackhide__
2016-04-20 13:07:02 +02:00
aa87395c39
Use py.builtin.callable
...
This restores compatibility with Python 3.0/3.1
2016-04-20 11:18:47 +02:00
75160547f2
Use a callable __tracebackhide__ for filtering
...
While this leads to slightly more complicated user code for the common
case (checking if the exception is of a given type) it's easier to
implement and more flexible.
2016-04-20 11:09:27 +02:00
4c552d4ef7
Fix tests for python 2.6
2016-04-20 10:36:13 +02:00
b607f6728f
Filter selectively with __tracebackhide__
...
When __tracebackhide__ gets set to an exception type or list/tuple of
exception types, only those exceptions get filtered, while the full
traceback is shown if another exception (e.g. a bug in a assertion
helper) happens.
2016-04-20 10:25:33 +02:00
a986b8f945
Merge pull request #1525 from The-Compiler/traceback-item
...
Fix TracebackItem documentation in pytest.code
2016-04-20 09:38:03 +02:00
c24e8e01b4
Fix TracebackItem documentation in pytest.code
...
The TracebackItem class does not exist, but it seems the docstrings refer to
TracebackEntry.
2016-04-20 08:35:17 +02:00
1a37035d71
Add test test_absolute_win32_path
2016-04-20 01:27:37 +08:00
99c4b6fdc3
issue 1496 - xfail with condition keyword
2016-04-19 18:12:37 +01:00
dd2425675b
Fix a small issue about shlex.split not working well with win32 path
2016-04-19 13:08:08 +08:00
6a3c943ce2
Merge pull request #1514 from The-Compiler/docfix
...
doc: Use ascii chars for file tree
2016-04-13 19:13:53 -03:00
98430a17f2
doc: Use ascii chars for file tree
...
LaTeX doesn't like those particular unicode chars, so let's avoid them so the
PDF builds easily.
2016-04-13 23:38:58 +02:00
fe6e1b2059
Merge pull request #1506 from prusse-martin/fix-repr-tb-with-unicode
...
Fix `repr_traceback` to work with unicode errors
2016-04-09 13:03:55 -03:00
7ce5873da2
Perform a "unicode aware" check for maximum recursion depth error
...
Avoid errors `UnicodeErrosr`s due non maximum recursion depth errors
when checking for those errors.
2016-04-08 23:32:18 -03:00
0eb80bcb5a
Merge pull request #1504 from guettli/patch-1
...
Hudson -> Jenkins
2016-04-05 14:57:03 +02:00
fb45f82840
Hudson -> Jenkins
2016-04-05 14:08:30 +02:00
0f7aeafe7c
Merge pull request #1486 from roolebo/fix-issue-138
...
Fix issue #138 - support chained exceptions
2016-04-03 19:21:57 +02:00
e3bc6faa2b
Merge pull request #1470 from ceridwen/features
...
Escape both bytes and unicode strings for "ids" in Metafunc.parametrize
2016-04-03 13:48:30 -03:00
909d72b474
Merge pull request #1502 from omarkohl/excinfo_match
...
Implement ExceptionInfo.match() method
2016-04-03 13:48:12 -03:00
0c38aacc33
Add self to AUTHORS
2016-04-03 11:23:30 +02:00
c578226d43
Implement ExceptionInfo.match() to match regexp on str(exception)
...
This implements similar functionality to
unittest.TestCase.assertRegexpMatches()
closes #372
2016-04-03 11:22:44 +02:00
23a8e2b469
Add .hypothesis to .gitignore and try an older version of Hypothesis for 2.6
2016-04-02 11:47:37 -04:00
08671fcf4a
Fix the changelog and dependencies for tox
2016-04-02 10:52:28 -04:00
491b30c5d9
Add Hypothesis test for _idval and fix bug it found
2016-04-01 22:45:44 -04:00
b631fc0bc1
Fix test_escaped_parametrized_names_xml
2016-04-01 21:30:45 -04:00
5af5ba11d3
Merge pull request #1500 from tgoodlet/lstrip-keywordexpr
...
Always lstrip() keyword expression
2016-04-01 17:48:58 -03:00
053c052190
Always lstrip() keyword expression
2016-04-01 13:10:05 -04:00
9b438d56e8
Fix a test_unicode_idval_python2 (now test_unicode_idval) and associated string handling on Python 3
2016-04-01 12:27:17 -04:00
Ronny Pfannschmidt
John Towler
Ronny Pfannschmidt
Florian Bruhin
Benjamin Dopplinger
palaviv
Bruno Oliveira
Omar Kohl
Ana Ribeiro
MengJueM
Florian Bruhin
TomV
Martin Prusse
Thomas Güttler
Ceridwen
Tyler Goodlet