8639bf7554
fixup! Merge pkg_resources workaround
2016-09-19 10:20:36 +01:00
f484e7c9ca
Merge pkg_resources workaround
...
Merge branch 'pkg_resources_bugfix' of github.com:raquel-ucl/pytest into pkg-resources
This is an odd case and doesn't really make sense, it is working around a bug
in maven/jython and the old version or weird packaging of setuptools they use.
But we used to do this in the past so might as well keep doing this.
2016-09-19 10:14:41 +01:00
f1faaea3fd
Update CHANGELOG.rst
2016-09-15 15:22:53 -07:00
04cf5e1df4
Fixed assertion rewriting for plugins in development mode
...
Fix #1934
2016-09-14 21:59:33 -03:00
8a41b26f56
Merge pull request #1908 from nicoddemus/parametrize-unicode-id
...
The "ids" argument to "parametrize" again accepts unicode strings in Python 2
2016-09-05 15:09:12 +02:00
ceeb5149f3
Mention register_assert_rewrite explicitly
...
It helps mentioning this explicitly in the changelog.
Fixes #1871 .
2016-09-05 13:09:36 +01:00
1e10de574d
The "ids" argument to "parametrize" again accepts unicode strings in Python 2
...
Fixes #1905
2016-09-02 18:38:15 -03:00
f5d900d972
Merge remote-tracking branch 'upstream/master' into features
2016-09-01 23:07:49 -03:00
ee284ec587
Set version to 3.0.3.dev0
...
Also, using "dev0" as development suffix otherwise distutils gives a warning during "setup.py develop":
UserWarning: Normalizing '3.0.3.dev' to '3.0.3.dev0'
normalized_version,
2016-09-01 21:34:54 -03:00
4e58c9a7d0
Fix use of deprecated getfuncargvalue method in the internal doctest plugin
...
Fix #1898
2016-09-01 07:19:11 -04:00
4c45b93007
Changes for 3.0.2 release
2016-08-31 20:28:38 -04:00
696a9112be
integrating review commets of @nicoddemus
...
plus small scale refactoring
2016-08-31 22:33:47 +02:00
be08223d5a
Merge branch 'master' into disable_tearDown_and_cleanups_for_post_mortem_debugging
...
Conflicts:
CHANGELOG.rst
2016-08-31 20:35:31 +02:00
10b3274924
adding corresponding test, authors and changelog
2016-08-31 20:22:54 +02:00
edf8283bd8
Add CHANGELOG entry for #1888
2016-08-30 23:13:27 -03:00
9d2149d9c0
Merge pull request #1884 from pytest-dev/master
...
merge master into features
2016-08-30 18:47:57 -03:00
86b8801470
Update AUTHORS and CHANGELOG
2016-08-26 09:42:17 +09:00
1b259f70f3
Testcase reports with a url attribute will now properly write this to junitxml
2016-08-25 13:08:51 -07:00
a152ea2dbb
Add buffer attribute to stdin stub
2016-08-24 16:26:34 -07:00
c5675d3efc
Remove merge-conflict marker merged by accident
...
Unfortunately rst-lint didn't catch that
2016-08-23 23:43:05 -03:00
972a5fb5d5
Improve error message when passing non-string ids to pytest.mark.parametrize
...
Fix #1857
2016-08-23 23:31:45 -03:00
7704f73db9
Merge branch 'master' into merge-master-into-features
2016-08-23 21:36:42 -03:00
ea0febad28
Updates for new patch version 3.0.2
2016-08-23 21:33:57 -03:00
49fc4e5e4c
Changes for 3.0.1 release
2016-08-23 18:15:43 -04:00
df200297e2
Fix internal error when parametrizing using and empty list of ids()
...
Fix #1849
2016-08-23 18:18:46 -03:00
d3f4b3d14a
mend
2016-08-23 16:50:00 +01:00
a1597aca89
Added #1853 to changelog as requested on PR.
2016-08-23 16:48:24 +01:00
53a0e2b118
Fix code which guesses parametrized scope based on arguments
...
Fix #1832
2016-08-22 21:05:41 -03:00
b54ea74d4d
Update AUTHORS and CHANGELOG for #1837
2016-08-22 17:59:42 -03:00
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
e306a53999
Fix spelling: s/outside a/outside of a/
2016-08-20 18:43:39 +02:00
90fb8cb08b
Merge pull request #1823 from nicoddemus/importorskip-regression
...
Fix regression when using importorskip at module level
2016-08-20 18:37:14 +02:00
87d2d1d838
Remove duplicate entry for #717 in CHANGELOG
2016-08-20 15:12:08 +02:00
63dc71c57e
Fix regression when using importorskip at module level
...
Fix #1822
2016-08-19 18:21:25 -03:00
db922403cc
Bump version to 3.1.0.dev
2016-08-19 17:44:07 -03:00
3a200b75c9
Bump version to 3.0.1.dev
2016-08-19 17:41:45 -03:00
745c8c17f1
Merge remote-tracking branch 'upstream/master'
2016-08-19 17:38:21 -03:00
b85a3b0d71
Merge pull request #1820 from The-Compiler/changelog-duplicates
...
Remove duplicate CHANGELOG messages
2016-08-19 17:35:23 -03:00
31ede2432c
Remove duplicate CHANGELOG messages
...
Those are both already mentioned in the breaking changes at the top.
2016-08-19 17:05:02 +02:00
3455dfc804
add missing @matthiasha link
2016-08-19 14:01:07 +02:00
cd39cc1eec
Mention doc update in CHANGELOG
2016-08-19 09:08:11 +02:00
7f18367582
Finalize CHANGELOG
2016-08-18 11:43:21 -04:00
56df9fcc72
Tweak CHANGELOG: move "change" entry to the proper place
2016-08-17 23:08:13 -03:00
030c42203d
Fix conflicts in CHANGELOG
2016-08-17 22:58:12 -03:00
463e6572c5
Merge branch 'master' into merge-master-into-features
...
Preparing for 3.0
2016-08-17 22:39:23 -03:00
0fb34cd2a1
Update CHANGELOG entries
2016-08-17 21:32:07 -03:00
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
c8ab79402c
Merge pull request #1811 from nicoddemus/revert-invocation-fixtures
...
Revert invocation-fixtures code
2016-08-17 20:32:54 +02:00
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
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
f25771a101
Deprecate --resultlog cmdline option
...
Fix #830
2016-08-16 21:40:34 -03:00
497152505e
Add CHANGELOG entry for #1809
2016-08-15 19:31:00 -03:00
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
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
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
c4d9c7ea55
Add thanks as requested.
2016-08-08 13:45:10 +01:00
e4028b4505
Fix #1798 to include errors in total tests in junit xml output.
2016-08-08 13:35:49 +01:00
802755ceed
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2016-08-06 17:58:17 -03:00
21230aa017
Add CHANGELOG entry
2016-08-06 17:14:13 -03:00
277b6d3974
Sort fixture names when a fixture lookup error occurs
2016-08-02 19:45:31 -03:00
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
1c8fe962f3
add changelog entry
2016-08-02 10:51:10 +02:00
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
5565c1f4ae
Sort link refs in CHANGELOG
2016-07-26 20:11:49 -03:00
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
9cf09cda7b
Remove some comments and improved changelog
2016-07-25 18:41:03 -03:00
d911bfcb8a
Merge branch 'issue634-scopes' of https://github.com/Stranger6667/pytest
...
# Conflicts:
# CHANGELOG.rst
2016-07-25 18:26:50 -03:00
8f29ce26e9
Merge branch 'mark_missing_fixture_error' of https://github.com/eolo999/pytest
2016-07-25 18:20:17 -03:00
d72afe7e08
Fixed scope override inside metafunc.parametrize. Fixes #634
2016-07-25 12:42:50 +02:00
ab6aef1d1f
feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.
2016-07-25 12:41:58 +02:00
f7ad173fee
Fixed collection of classes with custom ``__new__`` method
2016-07-25 11:33:37 +02:00
a309a571d9
Cleanups for #1763
2016-07-25 10:17:46 +02:00
e9d729bd46
drop parenthesis around GH issue number
2016-07-25 10:11:37 +02:00
a24146dd3c
Merge pull request #1757 from tramwaj29/improved-message-when-not-using-parametrized-variable
...
Improved message when not using parametrized variable
2016-07-24 13:02:03 -03:00
42adaf5a61
Fix #1210 display msg for early calls to exit
2016-07-24 14:16:34 +02:00
4aede6faa6
fixed conflicts
2016-07-24 12:10:32 +02:00
d000f2536a
added a test for when the indirect is just a string
2016-07-24 10:47:06 +02:00
0ae77be9f0
Add new target links in CHANGELOG
2016-07-24 00:46:06 +02:00
5c5d7e05f7
Followup to #1718 : style/formatting
2016-07-24 00:21:42 +02:00
f450e0a1db
Thanks to Tom Viner for his guidance during EuroPython2016 sprint
2016-07-24 00:06:16 +02:00
fabe8cda2f
Thanking myself in CHANGELOG
2016-07-23 23:59:34 +02:00
3c4158ac35
Add changelog entry for this bugfix branch
2016-07-23 23:51:11 +02:00
bbc7f3a631
updated changelog, resolve #1539
2016-07-23 16:57:49 +02:00
922a295729
fixes changelog, I think I got it
2016-07-23 15:15:17 +02:00
014ebc9202
Removed bug reference in changelog because it makes the linting fail.
2016-07-23 15:04:19 +02:00
fd8e019cc1
Choose the doctest output format in case of failure, still work in progress as a few checks fail (related to #1749 )
2016-07-23 14:40:46 +02:00
1aab6e3bc2
Add changes to changelog.
2016-07-22 12:54:42 +02:00
4f2bf965cb
Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures
2016-07-20 21:16:27 -03:00
20f97c3041
Small documentation improvements
2016-07-20 20:22:28 -03:00
e0f08a73ab
Merge branch 'features' into conftest-exception-printing
2016-07-20 19:33:36 -03:00
0403266bf0
record --exitfirst change in changelog
2016-07-20 17:23:07 +02:00
9af872a230
update changelog
2016-07-19 20:11:47 +02:00
8a73a2ad60
Merge pull request #1734 from nicoddemus/issue-1728-inconsistent-setup-teardown
...
setup_* and teardown_* functions argument now optional
2016-07-15 14:59:22 +02:00
ff8fb4950e
setup_* and teardown_* functions argument now optional
...
setup_module, setup_function and setup_method
extra argument are now optional and may be omitted.
Fix #1728
2016-07-14 23:41:40 -03:00
d1852a48b7
Remove assertion reinterpretation
...
The assertion reinterpretation is an old backwards compatibility
mode which was no longer being maintained on feature-parity with
the assertion rewriting mode. It was also responsible for some
dubious patching of builtins and test with side-effects would
suddenly start passing. Since re-writing has been the default for
a long time and plugins are now also re-written it is time to
retire reinterpretation.
2016-07-15 00:33:39 +01:00
24fbbbef1f
Merge pull request #1641 from flub/rewrite-plugins
...
Rewrite plugins
2016-07-14 19:39:15 +01:00
691dc8bc68
Merge pull request #1727 from nicoddemus/deprecate-str-pytest-main
...
Deprecate support for passing command-line as string to pytest.main()
2016-07-14 14:42:14 +02:00
02dd7d612a
Remove duplicated changelog entry and formatting fix
2016-07-14 08:16:27 -03:00
ab0b6faa5f
Deprecate support for passing command-line as string to pytest.main()
...
Fixes #1723
2016-07-14 08:11:43 -03:00
1266ebec83
Merge remote-tracking branch 'upstream/features' into warnings-displayed-by-default
...
# Conflicts:
# CHANGELOG.rst
# testing/test_terminal.py
2016-07-13 18:45:15 -03:00
a98e3cefc5
Enable re-writing of setuptools-installed plugins
...
Hook up the PEP 302 import hook very early in pytest startup so
that it gets installed before setuptools-installed plugins are
imported. Also iterate over all installed plugins and mark them
for rewriting. If an installed plugin is already imported then
a warning is issued, we can not break since that might break
existing plugins and the fallback will still be gracefull to
plain asserts.
Some existing tests are failing in this commit because of the new
warning triggered by inline pytest runs due to the hypothesis
plugin already being imported. The tests will be fixed in the next
commit.
2016-07-13 17:29:19 +01:00
4a763accc5
Improve overall CHANGELOG formatting and consistency for 3.0
2016-07-13 08:52:36 -03:00
dfe1209d2c
De-404 links in changelog
2016-07-13 11:41:27 +02:00
c4f20a1834
Merge pull request #1712 from anntzer/custom-debugger
...
Allow passing a custom Pdb subclass via --pdbcls.
2016-07-12 16:45:07 +02:00
7ee3dd1cb5
Add tests for custom pdb class.
...
(and edit CHANGELOG)
2016-07-11 20:07:29 -07:00
458ecae1df
Replace all usages of "pytest_funcarg__" for @pytest.fixture
2016-07-11 22:21:52 -03:00
ad4125dc0d
Deprecate "pytest_funcarg__" prefix to declare fixtures
...
Fixes #1684
2016-07-11 22:21:50 -03:00
5506dc700c
Deprecate yield tests
...
Closes #16
Closes #1324
2016-07-11 22:21:49 -03:00
2ffe354f21
Add CHANGELOG for invocation-scoped fixtures
2016-07-11 20:32:59 -03:00
6383b53ad9
Allow passing a custom Pdb subclass via --pdbcls.
...
This obviates the need for plugins such as `pytest-ipdb`; instead one
can simply call `py.test --pdb=IPython.core.debugger:Pdb`
2016-07-09 21:10:52 -07:00
668ebb102c
Clean up changelog
...
- Merged 3.0 and 2.10 as much stuff from the sprint went to the 2.10
section.
- Cleaned up mixture of link/text blocks
- Moved some entries to "Bug Fixes" and "Incompatible changes"
- Stop doing "Fixes (#123 ) ..." because it looks weird
- Add some new empty points for all sections
2016-07-08 18:51:26 +02:00
dad6aa8a16
fix duplicate target in changelog
2016-07-06 13:51:13 +02:00
b9a91dc112
merge from master to features
2016-07-06 11:51:48 +02:00
94e4a2dd67
* implemented changes recommended by nicoddemus
2016-07-05 15:22:27 +02:00
0171cfa30f
Fixing link to issue and creating testcase that shows that it finds the line in the stderr lines
2016-07-05 10:39:12 +01:00
61e605f60b
Making conftest import failures easier to debug
2016-07-05 10:04:42 +01:00
b650c3c118
Implement --setup-show cli flag
...
to also be able to see fixture setup with normal test execution.
2016-07-03 22:30:51 +02:00
7dc8d1ab60
fix typo and remove python3.2 from readme
2016-06-27 18:19:00 +02:00
e877e25587
drop python 3.0-3.2 support code from setup.py
...
addresses #1627
2016-06-27 17:55:37 +02:00
44695ae46c
Fix CHANGELOG: obestwalter appearing twice due to mergig separate PRs
2016-06-26 23:44:07 +02:00
22c2d87633
Fix bad merge in CHANGELOG
2016-06-26 21:18:01 +02:00
5891061ac1
Merge pull request #1675 from kvas-it/issue-1562
...
Add warning for assertions on tuples #1562
2016-06-26 16:09:15 -03:00
48ac1a0986
Merge branch 'remove-old-entry-points' into features
2016-06-26 20:38:59 +02:00
b9536608c5
Add issue and obestwalter to CHANGELOG
...
Fix #1632
2016-06-26 20:36:04 +02:00
f7a2048e96
Merge branch 'features' of https://github.com/Avira/pytest into remove-old-entry-points
2016-06-26 20:32:38 +02:00
7239f36466
Improve formatting in CHANGELOG
2016-06-26 19:41:01 +02:00
0e2ebc96ff
Remove deprecated cmd options
...
Fixes #1657
2016-06-26 19:26:04 +02:00
b4e0fabf93
* added missing link to the referenced issue
2016-06-26 06:52:50 +02:00
0db4ae15a9
Update changelog
2016-06-25 19:34:55 +02:00
e04d9ff80b
* now showing pytest warnings summary by default.
...
* added ``--disable-pytest-warnings` flag to let users disable the warnings summary.
* extended/changed unit tests for the changes in the pytest core.
2016-06-25 18:16:13 +02:00
e2f550156e
Improve of the test output for logical expression with brackets.
...
Fixes #925
2016-06-25 18:10:36 +02:00
856e6cab75
add --override-ini option to overrides ini values
...
Signed-off-by: Ted Xiao <xiao.xj@gmail.com>
2016-06-25 23:45:32 +08:00
13a188fe37
Merge pull request #1647 from sallner/features
...
Add new options to report fixture setup and teardown
2016-06-25 16:38:37 +02:00
3a9e9fdf82
rephrase changes in CHANGELOG.rst
2016-06-25 16:04:23 +02:00
72450408ed
add changes in CHANGELOG.rst
2016-06-25 16:00:49 +02:00
2af3a7a9d7
Merge pull request #1519 from omarkohl/pytest_skip_decorator
...
Raise CollectError if pytest.skip() is called during collection
2016-06-25 15:20:34 +02:00
1b6bc4d606
Add feature proposal to changelog
2016-06-25 14:58:18 +02:00
c519b9517a
Merge pull request #1663 from aostr/master
...
Rename the default plugin "pdb" into "debugging"
2016-06-25 09:56:54 -03:00
ce603dc0ea
Add changelog entry for #1564
2016-06-25 14:18:41 +02:00
9a5224e2f8
Renamed the pdb module and changed unit tests accordingly
2016-06-25 12:37:31 +02:00
32ca5cdb09
Update changelog for new fixture hooks.
2016-06-25 12:33:31 +02:00
b3615ac29d
Update CHANGELOG with #607 and add version 3.0.0.dev1
2016-06-24 20:56:21 +02:00
77689eb486
Fixes #1503 no longer collapse false explanations
2016-06-24 15:35:24 +02:00
df9918eda3
issue1625, name getfuncargvalue to getfixturevalue
2016-06-24 10:08:19 +02:00
69bab4ab04
added check for already existing option names to OptionGroup.addoption()
2016-06-22 18:01:35 +02:00
ecc97aa3b9
Use correct links in changelog.
2016-06-22 17:52:13 +02:00
dd97a2e7c8
Merge from upstream
2016-06-22 17:51:48 +02:00
0dbf77e08e
Add to changelog and authors.
2016-06-22 17:37:58 +02:00
18ef7de96b
merge from master again
2016-06-22 16:03:52 +02:00
083f64100d
merge master into features
2016-06-22 14:39:33 +02:00
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
Floris Bruynooghe
Skylar Downes
Bruno Oliveira
Florian Bruhin
mbyt
Ahn Ki-Wook
John Towler
Jordan Guymon
Raquel Alegre
Daniel Hahler
Florian Bruhin
matthiasha
Christian Boelsen
Ronny Pfannschmidt
satoru
Dmitry Dygalo
Roberto Polli
Edoardo Batini
Tom Viner
JJ
Romain Dorgueil
Javi Romero
Ronny Pfannschmidt
Kalle Bronsen
Antony Lee
aostr
Javier Domingo Cansino
Steffen Allner
RedBeardCode
Vasily Kuznetsov
Ted Xiao
holger krekel
Oliver Bestwalter
Raphael Pierzina
Danielle Jenkins
Omar Kohl
Stefan Zimmermann
Dave Hunt
palaviv
taschini
Guyzmo
marscher
Thomas Grainger
AbdealiJK
Adam Chainz
MengJueM
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