fb79fa711b
Merge branch 'issue1553/diff-final-newline' of https://github.com/tomviner/pytest
2016-06-22 14:21:30 +02:00
ec25d398a5
fix changelog links
2016-06-22 10:06:14 +02:00
98adf204b2
issue 1553: Include terminal newlines in diffs
2016-06-22 09:50:15 +02:00
4350f499b2
Merge branch 'issue1629' of https://github.com/davehunt/pytest into features
2016-06-21 18:37:14 +02:00
573866bfad
Merge remote-tracking branch 'upstream/features' into issue-1619-conftest-assert-rewrite
2016-06-21 18:10:19 +02:00
393167b94f
Update CHANGELOG and add Oliver Bestwalter to AUTHORS
2016-06-21 16:59:14 +02:00
ede7478dcc
Exit pytest on collection error (without executing tests)
...
Add --continue-on-collection-errors option to restore the previous behaviour:
Execute tests (that were successfully collected) even when collection errors
happen.
Some tests had to be modified e.g. because the return code changed to 2
(EXIT_INTERRUPTED) instead of 1 (EXIT_TESTSFAILED) because an Interrupted
exception is raised on collection error.
Implemented via pair programming with:
Oleg Pidsadnyi <oleg.pidsadnyi@gmail.com>
closes #1421
2016-06-21 13:32:34 +02:00
5854a71ece
Issue 460: getfuncargvalue fixture w. params err
2016-06-21 11:29:21 +02:00
e0cb046885
Update AUTHORS and CHANGELOG
2016-06-20 23:16:06 +02:00
4f2db6c08d
Merge pull request #1616 from palaviv/pytest.raises-message
...
Pytest.raises custom error message
2016-06-20 18:43:12 +02:00
c29130d400
Updated documentation
2016-06-19 23:34:42 +03:00
72bf11cbe9
Add disabled() method to capsys and capfd
...
Fix #1599
2016-06-19 19:14:36 +02:00
e6ff01ada3
CR fixes
2016-06-16 21:09:15 +03:00
8ddbca36c9
Add CHANGLOG entry
2016-06-16 20:21:03 +03:00
308396ae3c
Merge pull request #1606 from hackebrot/show-fixtures-per-test
...
Show fixtures per test
2016-06-14 09:54:18 -03:00
1218392413
Added taschini to AUTHORS and #1597 to CHANGELOG.rst.
2016-06-14 07:16:20 +02:00
accd962c9f
Fixed issue shadowing error when missing argument on teardown_method
...
When the method argument is missing on teardown_method, the traceback is
100% internal to pytest, which with default options get pruned. Then
that traceback is empty, leading to a new exception as a traceback shall
not be empty.
This PR fixes that issue by pushing back the last stack on the
traceback, when the stacktrace is empty after pruning. Then the output
is still pruned, but gives meaningful information with the item where it
failed on the stack.
* fixes issue #1604
Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
2016-06-12 03:45:24 +02:00
bbc6c18448
Add changelog entry for new cli flag
2016-06-12 00:26:32 +01:00
371fbe4388
Update CHANGELOG (yield statements in normal fixtures)
2016-06-08 21:07:53 -03:00
09d163aa3a
[exception handling] Fix case the current working directory (CWD) gets deleted during testing.
...
Fixes #1235 .
2016-06-08 15:18:23 +02:00
dd9c81ca26
Mention #1580 in the CHANGELOG and add Thomas Grainger to AUTHORS
2016-06-01 19:56:45 -03:00
2898dffb9e
Fix rst-lint CHANGELOG error
2016-06-01 17:43:41 +01:00
b5bd4d959d
merge master to features
2016-06-01 08:13:26 +02:00
f423f08b45
prepare cangelog for the next bugfix release
2016-06-01 08:04:21 +02:00
a2a904466c
alter changelog header
2016-05-31 19:05:36 +02:00
945072b89a
Update changelog with --fixtures fix
2016-05-31 11:47:16 +01:00
158f3cfaea
merge master
2016-05-31 11:24:53 +02:00
ae4dff0e0a
add missing link to changelog
2016-05-30 14:34:38 +02:00
d217b52508
fix #510 by adding a describing skip marker on empty parameterize
2016-05-30 14:34:38 +02:00
8c1be624a6
Merge pull request #1554 from RonnyPfannschmidt/merge-master
...
Merge master into features
2016-05-24 11:09:33 -03:00
5ab5a11544
Merge pull request #1565 from tomviner/issue1544/ignore-build-dist-dirs
...
Issue 1544: norecursedirs build & dist dirs
2016-05-23 19:30:20 -03:00
26b526967e
merge from master again
2016-05-23 22:33:00 +02:00
d6dfb1a393
issue 1544: norecursedirs build & dist dirs
2016-05-23 21:02:29 +01:00
d4c9fa9f1a
unittest.UnitTestCase: Allow __test__ for methods
...
__test__ needs to be checked for methods of a class too. Earlier,
this was not done, and all methods in a class was assumed to be
a test. This commit adds the appropriate condition to ensure that
if the __test__ is set to False, it does not collect that method.
Fixes https://github.com/pytest-dev/pytest/issues/1558
2016-05-19 08:19:57 +05:30
8a39869347
Convert readthedocs link for their .org -> .io migration for hosted projects
...
As per their email ‘Changes to project subdomains’:
> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.
Test Plan: Manually visited all the links I’ve modified. One was not modified - `http://media.readthedocs.org/epub/pytest/latest/pytest.epub ` - since it doesn't work on `readthedocs.io`.
2016-05-18 17:12:39 +01:00
eab762ea99
Merge branch 'master' into merge-master
2016-05-13 19:37:41 +02:00
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
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
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
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
f51c34ef31
Add changelog
2016-04-20 22:32:35 +08: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
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
99c4b6fdc3
issue 1496 - xfail with condition keyword
2016-04-19 18:12:37 +01: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
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
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
3ffce6ae4a
Added thanks and PR links in changlog
2016-03-23 18:53:50 +02:00
412042d987
added entry to CHANGELOG
2016-03-23 00:21:24 +02:00
1f46015de5
Merge remote-tracking branch 'upstream/features' into features
2016-03-22 16:22:00 -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
725290a8ab
Add 'Minor doc fixes' to CHANGELOG
2016-03-20 20:39:31 +01:00
dd384f7f78
Added changlog entries
2016-03-20 19:01:47 +02:00
52bc2f8616
Update authors & changelog
2016-03-20 01:06:53 +03:00
5fcce8a7d6
Merge branch 'master' into merge-master-into-features
2016-03-18 18:26:56 -03:00
a70e92777f
Bump version to 2.9.2.dev1
2016-03-18 18:24:24 -03:00
699f094b0c
Finalize CHANGELOG for 2.9.1
2016-03-17 17:04:26 -04:00
fa6acdcfd4
junitxml: add properties node in testsuite level
...
The commit allow users to add a properties node in testsuite level see
example below:
<testsuite errors="0" failures="0" name="pytest" skips="1" tests="1"
time="11.824">
<properties>
<property name="ARCH" value="PPC"/>
<property name="OS" value="RHEL 7.2"/>
<property name="TestPlanURL" value="https://url .."/>
<property name="Automated" value="True"/>
</properties>
<testcase classname="git.....>
</testcase>
</testsuite>
The current situation is that properties node can be added to every
testcase node. However, sometimes we need some global properties that
applies to all testcases and give better description for the testsuite
itself.
2016-03-16 13:24:33 +02:00
5ceee08590
Fix CHANGELOG merge conflicts.
2016-03-14 11:55:50 -07:00
981fcb2798
added CHANGELOG and AUTHORS entry
2016-03-13 23:47:41 +02:00
861265411f
Add "thanks" line to the CHANGELOG.
2016-03-12 22:15:19 -08:00
9577120592
Allow custom fixture names for fixtures
...
When defining a fixture in the same module as where it is used, the
function argument shadows the fixture name, which a) annoys pylint and
b) can lead to bugs where you forget to request a fixture into a test
method.
This allows one to define fixtures with a different name than the name
of the function, bypassing that problem.
2016-03-09 14:58:54 -08:00
7a186df271
Improve error message when a plugin fails to import
2016-03-08 19:18:13 -03:00
4d0f066db7
Add approx() to the CHANGELOG.
2016-03-07 18:29:22 -08:00
6d4b14d7ee
Merge pull request #1438 from Bachmann1234/issue-1437
...
Make a good faith effort to display a bytestring when one is provided…
2016-03-06 06:48:32 +01:00
fd0010e6e9
Merge pull request #1439 from pytest-dev/fix-1178
...
Support pytest.fail with non-ascii characters
Fixes #1178
2016-03-06 06:42:35 +01:00
8ce32b0795
When a regex pattern contains bytes instead of a string use escape_encode to turn it into a string before further processing. Thanks @nicoddemus for the review and tips!
2016-03-05 21:04:34 -05:00
d8403d793f
Fix decoding issue while formatting SyntaxErrors during collection
...
This happens only in Python 2, as in Python 3 we receive
the "badline" in the exception is already properly encoded
Fix #578
2016-03-05 16:58:50 -03:00
24d3e01548
pytest.fail with non-ascii characters raises an internal pytest error
...
Fix #1178
2016-03-05 16:09:01 -03:00
3d2b7aeea5
issue469: junit parsing nodeid, add method test
2016-03-03 09:12:56 +00:00
c2b9196a7c
Merge remote-tracking branch 'upstream/master' into features
2016-03-02 23:41:56 -03:00
2e02a1c370
Give proper credit for PR #1428
2016-03-02 23:30:42 -03:00
28530836c9
issue469: add fix junit double colon split issue
2016-03-02 22:18:57 +00:00
0cbd58e16a
Reformat versions and header levels in CHANGELOG file
2016-03-02 22:07:30 +03:00
4bcc06362d
Minor README tweaks (markup, phrasing)
2016-03-02 11:59:04 -05:00
891e029518
Add a new doctest_namespace fixture
...
This fixture can be used to inject names into the namespace in which
your doctests run.
2016-03-02 12:43:57 +00:00
316e39872a
Add 2.9.1.dev1 to CHANGELOG
2016-03-01 18:55:53 -03:00
5a2500800d
Add 2.10.0.dev1 to CHANGELOG
2016-03-01 18:54:08 -03:00
7d2b65813e
Fix typo in CHANGELOG
2016-02-29 16:48:28 -05:00
2d7cfcd686
Finalize CHANGELOG
2016-02-29 15:42:15 -05:00
7e758a9dc6
junit: allow multiple properties with same name
...
It might happen that test can be affected by two or more bugs.
I need to be able to track them all.
2016-02-29 16:00:26 +01:00
ab90043adc
Update changelog with traceback style docs fix
2016-02-27 21:07:13 +00:00
d98d655094
Simplify IndexError test.
2016-02-26 08:25:49 -04:00
cf9a09e988
catch IndexError exceptions when getting exception source location
2016-02-26 08:18:12 -04:00
96a331e32f
Display collect progress only when in a terminal
...
Fix #1397
2016-02-20 14:38:30 -02:00
b76de91474
Add issue and PR GitHub templates
2016-02-18 18:26:38 -02:00
6940f82235
Merge pull request #1389 from nicoddemus/fix-strict-xfail
...
Fix bug in strict xfail: test was not being actually called
2016-02-17 17:58:49 -02:00
3dd50d039d
Fix rst syntax
2016-02-15 23:07:31 +00:00
ee88679c54
Fix bug in strict xfail: test was not being actually called
2016-02-15 18:43:45 -02:00
9af1f63ab6
Small typo in CHANGELOG
2016-02-14 23:36:17 -02:00
9aae4b782b
Add CHANGELOG entry for #1355
2016-02-14 23:31:31 -02:00
1b431d6644
fix formatting utf-8 error explanation
2016-02-12 20:28:06 +01:00
bfa2fadac1
fix issue #1366 by showing a note on the --fulltrace option
2016-02-10 20:27:50 +01:00
2b764a0e73
Fix CHANGELOG entry to new format
2016-02-06 09:37:13 -02:00
51694b8295
Merge branch 'master' into issue1290-at-operator
2016-02-06 09:31:42 -02:00
de1a9f574c
merge from master
2016-02-05 00:10:28 +01:00
79722ae89b
Add expected exceptions to 'DID NOT RAISE' msg
2016-02-03 14:12:41 +03:00
74a68b5ec6
Add CHANGELOG and docs for #1345
2016-01-27 19:57:11 -02:00
4825678e1a
Add CHANGELOG entry for py.code merge
2016-01-26 20:24:08 -02:00
199fcf93d4
Merge branch 'master' into 'features'
2016-01-22 18:32:45 -02:00
bc32e45bb6
Merge pull request #1314 from The-Compiler/ci-verbose
...
Always show full comparison output if on CI.
2016-01-11 10:05:15 +01:00
3e5c9038ec
Always show full comparison output if on CI.
...
When you don't get enough information with a test running on a CI, it's quite
frustrating, for various reasons:
- It's more likely to be a flaky test, so you might not be able to reproduce
the failure.
- Passing -vv is quite bothersome (creating a temporary commit and reverting
it)
For those reasons, if something goes wrong on CI, it's good to have as much
information as possible.
2016-01-11 08:45:04 +01:00
b8784c28c9
Merge branch 'master' into 'features'
2016-01-08 21:51:34 -02:00
02dd6df6e6
Changelog now in rst format (2.9.0 and onward) and add rst-lint check
...
Fix #1274
2016-01-03 23:09:24 -02:00
Bruno Oliveira
Tom Viner
Dave Hunt
Omar Kohl
Florian Bruhin
palaviv
taschini
Guyzmo
Raphael Pierzina
marscher
Thomas Grainger
Ronny Pfannschmidt
AbdealiJK
Adam Chainz
MengJueM
Florian Bruhin
Martin Prusse
Ceridwen
Quentin Pradet
Roman Bolshakov
Tareq Alayan
Kale Kundert
Mike Lundy
Matt Bachmann
Vladimir Bolshakov
Zearin
Matt Williams
Lukas Bednar
Ryan Wooden
Anatoly Bubenkov
Marcin Biernat
Georgy Dyuldin