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
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
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
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
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
56156bb119
Merge pull request #1490 from omarkohl/get_issues
...
Adapt get_issues.py script for GitHub (instead of Bitbucket)
2016-03-28 20:15:29 -03:00
e048315d9b
Adapt get_issues.py script for GitHub (instead of Bitbucket)
2016-03-28 20:00:57 +02:00
89df701ae9
Comment a workaround for #1485 .
2016-03-27 13:15:56 +03:00
fed89ef549
Merge pull request #1474 from palaviv/improve-idmaker-duplicate-names
...
Improve idmaker name selection in case of duplicate ids in parametrize
2016-03-23 20:38:29 -03:00
3ffce6ae4a
Added thanks and PR links in changlog
2016-03-23 18:53:50 +02:00
c66aedfa65
checking first there are duplciates ids before changing to unique names
2016-03-23 18:47:27 +02:00
3155d0ca9c
Merge pull request #1475 from nicoddemus/classifier-docs
...
Mention Pytest::Framework PyPI classifier on docs
2016-03-23 06:12:34 +01:00
53d319144d
Mention Pytest::Framework PyPI classifier on docs
2016-03-22 20:42:52 -03:00
412042d987
added entry to CHANGELOG
2016-03-23 00:21:24 +02:00
b8c15a0215
improved idmaker name selection in case of duplicate ids
2016-03-23 00:20:58 +02:00
1f46015de5
Merge remote-tracking branch 'upstream/features' into features
2016-03-22 16:22:00 -04:00
6ddfd60ce7
Merge pull request #1472 from pquentin/master
...
Fix pytest.mark.skip mark when used in strict mode
2016-03-22 13:49:57 +01:00
653a53226a
Add strict parameter to xfail marker doc
2016-03-22 16:01:51 +04:00
1fbd19b8cb
Fix pytest.mark.skip mark when used in strict mode
2016-03-22 15:40:34 +04:00
4405dd0ffe
Escape both bytes and unicode strings for "ids" in Metafunc.parametrize
2016-03-22 01:31:48 -04:00
890c2fa555
Merge pull request #1469 from omarkohl/doc-fixes
...
Doc fixes
2016-03-20 20:48:36 +01:00
725290a8ab
Add 'Minor doc fixes' to CHANGELOG
2016-03-20 20:39:31 +01:00
da1045151f
Merge pull request #1468 from palaviv/allow-none-as-parametrized-test-id
...
None in paramtrized test id will use automatically generated id
2016-03-20 20:19:50 +01:00
98c707561c
Document --full-trace option and KeyboardInterrupt
...
fix #513
2016-03-20 20:07:16 +01:00
a341dddc74
Replace --fulltrace with --full-trace in doc
...
Since 'py.test --help' shows --full-trace as an option (and not --fulltrace)
even though both forms are accepted I assume --full-trace is the preferred form
and should therefore be used in the documentation.
2016-03-20 19:51:23 +01:00
dd384f7f78
Added changlog entries
2016-03-20 19:01:47 +02:00
7885e43b78
Merge remote-tracking branch 'upstream/features' into allow-none-as-parametrized-test-id
2016-03-20 18:57:17 +02:00
Ronny Pfannschmidt
palaviv
Bruno Oliveira
Omar Kohl
Ana Ribeiro
Florian Bruhin
Ceridwen
Roman Bolshakov
Florian Bruhin
Quentin Pradet