023687d8d0
Merge pull request #872 from nicoddemus/confcutdir-inifile
...
Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini by default
2015-07-25 14:03:24 +02:00
9f94e443ff
Merge remote-tracking branch 'upstream/pytest-2.7'
...
Conflicts:
testing/conftest.py
2015-07-24 19:24:21 -03:00
91e8e59cea
Merge pull request #860 from nicoddemus/warn-plugins-as-str-main
...
Make passing plugins as str objects a more obvious failure
2015-07-24 19:13:39 -03:00
d104487282
importorskip: Allow non-integer version strings
...
Use `pkg_resources.parse_version` to parse version strings.
This can handle 'dev', 'rc', alpha and beta version strings,
among others.
2015-07-24 12:34:06 -04:00
35bbcc39a2
Interpret strings to "plugins" arg in pytest.main() as module names
...
See #855
2015-07-23 23:37:09 -03:00
ab9e246ab0
Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default
...
As discussed in #82
2015-07-23 23:21:07 -03:00
df29120abe
Merge branch 'pytest-2.7'
...
Conflicts:
_pytest/config.py
_pytest/genscript.py
_pytest/mark.py
tox.ini
2015-07-23 22:35:51 -03:00
ce96973ed5
Merge pull request #864 from pytest-dev/consider-color-yes-everywhere
...
Consider --color option in more places which deal with TerminalWriters
2015-07-23 08:03:52 -03:00
77844ec5f3
Fixed typo in CHANGELOG: "testdirs" -> "testpaths"
2015-07-22 12:14:49 -03:00
0e26de2218
Merge pull request #867 from nicoddemus/autouse-yield-fixture-class
...
Fix autouse fixtures defined in a TestCase subclass
2015-07-22 01:25:21 +02:00
31cfbac1f4
Fix autouse fixtures defined in a TestCase subclass
2015-07-20 19:28:54 -03:00
6af7172204
Merge branch 'pytest-2.7'
2015-07-19 15:25:04 +02:00
953916df49
Report correct reason when using multiple skip/xfail markers
2015-07-18 18:18:45 -03:00
2f7d0f8bd9
Consider --color option in more places which deal with TerminalWriters
2015-07-18 16:39:55 -03:00
b18e6439bd
Ast Call signature changed on 3.5
...
fix issue 744 on bitbucket
port of merge request 296
https://bitbucket.org/pytest-dev/pytest/pull-request/296/astcall-signature-changed-on-35
https://bitbucket.org/pytest-dev/pytest/issue/744/
Conflicts:
CHANGELOG
2015-07-18 13:15:46 -03:00
5e0235946b
Merge pull request #801 from Carreau/test-35
...
Support Python 3.5
2015-07-18 11:30:36 +01:00
330de0a93d
Use a subdirectory in the TEMP directory to speed up tmpdir creation
...
Fix #105
2015-07-16 19:50:49 -03:00
aa25fb05a9
Make sure marks in subclasses don't change marks in superclasses
...
Fix #842
2015-07-16 19:29:16 -03:00
0f52856f99
Use a subdirectory in the TEMP directory to speed up tmpdir creation
...
Fix #105
2015-07-15 20:03:58 -03:00
26e64fc45c
Ast Call signature changed on 3.5
...
fix issue 744 on bitbucket
port of merge request 296
https://bitbucket.org/pytest-dev/pytest/pull-request/296/astcall-signature-changed-on-35
https://bitbucket.org/pytest-dev/pytest/issue/744/
2015-07-15 13:49:40 -07:00
d6033037ac
Consider session fixtures for doctest docstrings in modules
...
Fixes #768
2015-07-13 12:29:09 -03:00
5750ae784a
Reword CHANGELOG a bit
2015-07-13 12:01:54 -03:00
5ec2a17f08
--fixtures only shows fixtures from first file
...
Fix #833
2015-07-12 17:32:39 -03:00
7445c5bd70
Add support for PEP302 get_data API
...
Fix #808
2015-07-11 14:13:43 -03:00
1baa1a4d01
Merge pull request #822 from nicoddemus/extra-usage-info
...
Print inifile and rootdir when there's usage errors
2015-07-11 13:43:20 -03:00
8a6aa5e17e
Print inifile and rootdir when there's usage errors
...
Related to #821
2015-07-10 21:56:12 -03:00
854e603f84
Add new testdirs ini option
...
Fix #694
2015-07-10 21:52:47 -03:00
d773c7498f
Reword entry in the changelog to show case the new status bar colors better
2015-07-03 18:36:15 -03:00
4ef6cdfb68
Add small thanks note to Eric Siegerman
2015-07-03 18:31:15 -03:00
d10054a38d
Merge branch 'esiegerman/summary_colors' of github.com:esiegerman/pytest
2015-07-03 18:29:17 -03:00
7fa27af408
Add `file` and `line` attributes to junit-xml output.
...
This adds the `file` and `line` attributes to the junit-xml output
which can be used by tooling to identify where tests come from. This can be
used for many things such as IDEs jumping to failures and test
runners evenly balancing tests among multiple executors.
Update test_junitxml.py
Foo.
2015-07-02 18:41:52 -04:00
2c419c4790
Add CHANGELOG and AUTHORS entries
2015-07-02 15:47:03 -04:00
27a98788a8
start 2.7.3 CHANGELOG
2015-06-26 00:30:26 -03:00
75679f08c9
Update AUTHORS and CHANGELOG
2015-06-25 17:38:45 +02:00
08613b621e
Merge pull request #799 from pytest-dev/noconftest
...
Add a --noconftest option.
2015-06-23 16:53:22 +02:00
ee40ea5f6d
Merge branch 'pytest-2.7'
...
Conflicts:
AUTHORS
_pytest/__init__.py
setup.py
testing/conftest.py
tox.ini
2015-06-23 16:49:05 +02:00
8e0589af69
Add changelog entry.
2015-06-23 09:47:07 +02:00
cba1ca6244
Fixed typo
2015-06-23 10:29:37 +10:00
cdd25c9512
bump version to 2.7, depend on py-1.4.29
2015-06-22 23:53:41 +02:00
080dfb9841
Merge pull request #788 from pytest-dev/issue-767
...
Fix issue where pytest.raises() doesn't always return Exception instance in py26
2015-06-19 13:41:44 +02:00
48d91def7e
Added workaround to still show the diff on containers with unsortable elements.
...
fix issue #718
2015-06-19 07:51:59 -03:00
eb73db56c7
Fix issue where pytest.raises() doesn't always return Exception instance in py26
...
Fixes #767
2015-06-19 07:46:47 -03:00
13c01193d6
Merge remote-tracking branch 'origin/pytest-2.7'
2015-06-19 10:03:37 +02:00
f90b2f845c
unittest.SkipTest now reports original function location
...
Fix #748
2015-06-18 22:27:43 -03:00
9d4e0365da
Skipif marker report now refers to the skipped function
...
Fix #114
2015-06-18 21:59:44 -03:00
4d6fef36f4
Merge branch 'pytest-2.7'
2015-06-17 13:42:41 +02:00
2a1424e563
Merge branch 'pytest-2.7' of github.com:curzona/pytest into pytest-2.7
...
Conflicts:
AUTHORS
CHANGELOG
2015-06-17 00:02:26 -03:00
1871d526ac
Update CHANGELOG and AUTHORS
2015-06-16 19:33:26 -07:00
0c05b906d4
backport fix for #713
2015-06-16 21:27:22 -03:00
0b0406fa85
Handle reports that don't have a reprcrash
...
Closes #713 (which happens because ReprFailDoctest
doesn't have a reprcrash)
2015-06-16 18:53:20 -04:00
8b53a72dde
add Janne`s changes to CHANGELOG
2015-06-06 11:53:34 +02:00
ca44e88e54
backport fixed issue735
...
--HG--
branch : pytest-2.7
2015-06-04 07:52:25 +02:00
f3ad2e4ad2
use NameConstant node when it exists ( fixes #735 )
...
--HG--
branch : issue735
2015-06-03 18:07:10 -05:00
c037f52878
fix issue741: make running output from testdir.run copy/pasteable
2015-06-03 23:40:42 +02:00
c92467df2f
add changelog for latest merge
2015-06-03 23:39:00 +02:00
d299f0d99f
Merge changes from 2.7.1 release
...
This is mostly doc examples regeneration, other changes are:
- Add 2.7.1 tag to .hgtags
- Update changelog to use real versions
- Update HOWTORELEASE.rst
- Fix rst in doc/en/adopt.txt
- Fix CHANGELOG and release-2.7.0 rst formatting
2015-05-19 21:43:50 +01:00
3d990a6237
Fix rest formatting and set final version number
...
--HG--
branch : pytest-2.7
2015-05-19 01:53:06 +01:00
bddc88f09e
adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts
...
--HG--
branch : pluggy1
2015-05-06 10:08:08 +02:00
aa2ffb9805
Merge fix for issue 731 from pytest-2.7
2015-04-30 21:13:03 +01:00
7f554f50e3
Fix collapse false to look at unescaped braces only
...
Sometimes the repr of an object can contain the "\n{" sequence which is
used as a formatting language, so they are escaped to "\\n{". But the
collapse-false code needs to look for the real "\n{" token instead of
simply "{" as otherwise it may get unbalanced braces from the object's
repr (sometimes caused by the collapsing of long reprs by saferepr).
Fixes issue #731 .
--HG--
branch : pytest-2.7
2015-04-30 02:31:12 +01:00
db5649ec6a
streamline pytester API majorly:
...
- integrate conftest into pytester plugin
- introduce runpytest() to either call runpytest_inline (default) or
runpytest_subprocess (python -m pytest)
- move testdir.inline_runsource1 to pdb tests
- strike some unneccessary methods.
- a new section "writing plugins" and some better pytester docs
--HG--
branch : testrefactor
2015-04-28 11:54:53 +02:00
c54afbe42e
deprecate and warn about __multicall__ usage in hooks, refine docs about hook ordering,
...
make hookwrappers respect tryfirst/trylast
--HG--
branch : more_plugin
2015-04-27 12:50:34 +02:00
7364647f2f
fix issue732: make sure removed plugins remove all hook callers.
...
--HG--
branch : more_plugin
2015-04-25 18:14:39 +02:00
ea50ef1588
split plugin documentation into "using" and "writing plugins",
...
referencing each other. Also add tryfirst/trylast examples.
--HG--
branch : more_plugin
2015-04-25 11:29:11 +02:00
d2a5c7f99b
add documented hookimpl_opts and hookspec_opts decorators
...
so that one doesn't have to use pytest.mark or function-attribute setting anymore
--HG--
branch : more_plugin
2015-04-25 11:29:11 +02:00
8fde2f98ae
merge default
...
--HG--
branch : plugin_no_pytest
2015-04-23 12:35:15 +02:00
e450218daa
Merge _pytest fixture reintroduction from pytest-2.7 branch
...
This was accidentally removed while some plugins depend on it.
2015-04-23 00:55:58 +01:00
9d5182eaad
reintroduced _pytest fixture of the pytester plugin which is used
...
at least by pytest-xdist.
--HG--
branch : reintroduce_pytest_fixture
2015-04-22 17:06:00 +02:00
715a235b45
remove shutdown logic from PluginManager and add a add_cleanup() API
...
for the already existing cleanup logic of the config object.
This simplifies lifecycle management as we don't keep two
layers of shutdown functions and also simplifies the pluginmanager
interface.
also add some docstrings.
--HG--
branch : plugin_no_pytest
2015-04-22 16:33:20 +02:00
240cd1f28d
Merge cleaning of sys.modules after pytester.inline_run()
...
Merged in schettino72/pytest/pytester-inline-run-clean-sys-modules
(pull request #278 ).
2015-04-21 11:00:32 +01:00
31af381c56
Merged in hpk42/pytest-patches/prefer_installed (pull request #275 )
...
change test module importing behaviour to append to sys.path
2015-04-21 10:47:33 +01:00
bc0ecd1d06
pytester: add method ``TmpTestdir.delete_loaded_modules()``
...
, and call it from ``inline_run()`` to allow temporary modules to be reloaded.
--HG--
branch : pytester-inline-run-clean-sys-modules
2015-04-21 10:18:04 +08:00
bac1ccd5b3
merge fix of issue553 on pytest-2.7
2015-04-17 22:32:49 +02:00
0b361c62c8
Merged in getsourcelines-error-issue-553-pytest2.7 (pull request #273 )
...
Handle inspect.getsourcelines failures in FixtureLookupError
--HG--
branch : pytest-2.7
2015-04-17 22:31:55 +02:00
5c8e5acf9d
change test module importing behaviour to append to sys.path
...
instead of prepending. This better allows to run test modules
against installated versions of a package even if the package
under test has the same import root. In this example::
testing/__init__.py
testing/test_pkg_under_test.py
pkg_under_test/
the tests will preferrably run against the installed version
of pkg_under_test whereas before they would always pick
up the local version.
--HG--
branch : prefer_installed
2015-04-17 22:25:35 +02:00
fb07a09964
Merge pull request #274 from pytest-2.7
...
fixed regression to 2.6.4 which surfaced e.g. in lost stdout capture printing
2015-04-17 11:10:47 +01:00
e04273df57
fixed regression to 2.6.4 which surfaced e.g. in lost stdout capture printing
...
when tests raised SystemExit.
--HG--
branch : systemexit
2015-04-17 11:47:29 +02:00
15328c04eb
Handle inspect.getsourcelines failures in FixtureLookupError
...
Fixes #553
--HG--
branch : getsourcelines-error-issue-553-pytest2.7
2015-04-15 19:31:22 -03:00
09dff73607
Merge pytest-2.7 for issue660 fix
2015-04-13 00:04:53 +01:00
6591d7a209
Merged in issue660 (pull request #268 )
...
fix issue660
--HG--
branch : pytest-2.7
2015-04-13 00:00:40 +01:00
ddffa9d1cc
Merge wheel support from pytest-2.7 branch
...
Merged in pytest-2.7 (pull request #269 ).
2015-04-12 23:47:10 +01:00
9cae9a2a97
Add wheel support in the changelog
...
--HG--
branch : pytest-2.7
2015-04-12 23:36:43 +01:00
236cac86b1
add me as author of PR
...
--HG--
branch : issue660
2015-04-04 16:36:32 +02:00
79c0515945
merge pytest-2.7 branch
...
--HG--
branch : issue660
2015-04-04 16:35:14 +02:00
74019025b9
shift default to 2.8.0.dev
2015-04-04 16:32:25 +02:00
0e916460d8
add changelog entries
...
--HG--
branch : pytest-2.7
2015-04-04 16:29:38 +02:00
b55d66d0cf
- avoid setting of versions and targets in conf.py and Makefile
...
as discussed on pytest-dev
- "make help" now prints pytest specific information.
- add a "_getdoctarget.py" helper
- make ``setup.py`` read the version from ``_pytest/__init__.py``
--HG--
branch : release-checklist
2015-04-02 10:38:25 +02:00
3ed3e51997
fix issue660: properly report fixture scope mismatches independent
...
from fixture argument ordering.
--HG--
branch : issue660
2015-04-01 18:42:48 +02:00
e16983d265
bump versions to dev, including changing the doc-install target to "dev"
...
instead of "latest"
2015-03-26 13:48:59 +01:00
d2a8866bce
bump verrsion to python2.7, fix a too precise test for windows, regen docs
2015-03-26 09:34:10 +01:00
d94a29e866
merge almarklein/default
2015-03-23 21:25:10 +01:00
ce95437dee
merge with default
...
--HG--
branch : issue463
2015-03-23 20:41:27 +01:00
3ba3112a85
update changelog
...
--HG--
branch : issue463
2015-03-23 20:28:04 +01:00
f3580bee2d
fix issue435: make reload() work when assert rewriting is active.
...
Thanks Daniel Hahler.
2015-03-23 10:08:47 +01:00
0fc75c9622
Storing sys.last_traceback: test, docs and changelog
2015-03-21 17:06:24 +01:00
060609317a
allow to override parametrized fixtures with non-parametrized ones and vice versa
...
--HG--
branch : parametrized-fixture-override
2015-03-01 13:54:43 +01:00
1e6e373913
Merged in issue616 (pull request #252 )
...
fix issue616 - conftest visibility fixes.
2015-02-28 10:02:58 +01:00
019dc14fc4
fix typos, clarify git/hg
...
--HG--
branch : docs_community
2015-02-27 13:38:45 +01:00
f6df3b0b97
added documentationo on the new pytest-dev teams on bitbucket and
...
github. See https://pytest.org/latest/contributing.html (tentative)
Thanks to Anatoly for pushing and initial work on this.
--HG--
branch : docs_community
2015-02-27 11:54:17 +01:00
8ed5b77aba
fix issue650: introduce new --doctest-ignore-import-errors option courtesy
...
of Charles Cloud.
2015-02-26 22:02:49 +01:00
d73e689991
fix issue616 - conftest visibility fixes. This is achieved by
...
refactoring how nodeid's are constructed. They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.
--HG--
branch : issue616
2015-02-26 21:56:44 +01:00
3d0b756877
merge in the 2.6 maintenance branch
2015-02-22 11:45:07 +01:00
d1adbf4a5c
Added documentation for PYTEST_ADDOPTS environment variable, updated CHANGELOG and AUTHORS.
...
--HG--
branch : env-addopts
2015-02-09 14:11:54 +00:00
5941b2e071
fix issue 655: crude workarounds around python2/3 exception leaks
2015-01-09 19:55:49 +01:00
e4bb48995a
Mention fix for issue 615 in changelog
...
Fixes issue 615.
2014-10-28 13:31:09 +00:00
d0d4759c96
fix changelog -- we should have all changes in trunk that are in 2.6.4
2014-10-24 17:19:54 +02:00
60cdb875ed
backport pastebin fix
...
--HG--
branch : pytest-2.6
2014-10-24 15:24:44 +02:00
0834b63560
backport fixed issue620 (doc for genscript)
...
--HG--
branch : pytest-2.6
2014-10-24 13:53:39 +02:00
5f2444d2a2
Merged in nicoddemus/pytest/fix-pastebin (pull request #228 )
...
Fix --pastebin option
2014-10-23 09:08:30 +02:00
537dca477b
Fixing --pastebin option by using a POST request instead of a XMLRPC call
...
fixes #614
--HG--
branch : fix-pastebin
2014-10-22 21:52:40 -02:00
c63dc62294
Mention issue351/PR161 in changelog
2014-10-22 23:20:27 +01:00
16f0d100cc
added changelog entry about glob-patterns in python_classes and python_functions
...
- also fixed small typo
--HG--
branch : python-classes-glob
2014-10-21 19:22:53 -02:00
8dfd6c17e3
add changelog note for tom's PR about parametrized markers.
2014-10-14 10:12:45 +02:00
857db415bc
fix some spelling mistakes
...
--HG--
branch : some_spelling_fixes
2014-10-13 23:16:26 +01:00
b7dd8eac8e
remove unused import
2014-10-09 22:45:33 +02:00
8b9bb5ff54
fix changelog
2014-10-09 17:06:39 +02:00
cea9367739
Merged in HolgerPeters/pytest (pull request #221 )
...
Make doctest flags configurable
2014-10-09 17:05:48 +02:00
c85c5d05c5
add changelog entry for new hookwrapper mechanism
2014-10-09 12:29:57 +02:00
61caa4f776
Add documentation for doctest flags and remove dead code
2014-10-08 15:48:41 +02:00
1ed1ef3c71
open up pytest-2.6 branch in case we want to release a 2.6.4 before 2.7.0 happens
...
--HG--
branch : pytest-2.6
2014-10-07 11:14:57 +02:00
a298077461
merge with default
2014-10-07 01:06:15 +02:00
966c63d477
merge with default
...
--HG--
branch : test_for_issue_604
2014-10-07 01:06:15 +02:00
a759da0208
Escape % character in the assertion message. closes #604
2014-10-07 01:01:21 +02:00
e1aed27c15
Escape % character in the assertion message. closes #604
...
--HG--
branch : test_for_issue_604
2014-10-07 01:01:21 +02:00
2cb0145bce
fix issue557: with "-k" we only allow the old style "-" for negation
...
at the beginning of strings and even that is deprecated. Use "not" instead.
This should allow to pick parametrized tests where "-" appeared in the parameter.
2014-10-06 12:11:48 +02:00
39158957f4
fix issue557: with "-k" we only allow the old style "-" for negation
...
at the beginning of strings and even that is deprecated. Use "not" instead.
This should allow to pick parametrized tests where "-" appeared in the parameter.
--HG--
branch : issue557
2014-10-06 12:11:48 +02:00
c6951d5184
add some changelog entries
2014-10-06 11:56:56 +02:00
dfda9acd6d
add some changelog entries
2014-10-06 11:56:56 +02:00
c7a45d6eaf
removed outdated japanese docs from source tree.
2014-09-29 12:31:15 +02:00
9e549a1acf
removed outdated japanese docs from source tree.
2014-09-29 12:31:15 +02:00
9a0f2a9fb7
Improve assertion failure reporting on iterables, by using ndiff and pprint.
2014-09-27 01:29:47 +00:00
72e6f55b45
Improve assertion failure reporting on iterables, by using ndiff and pprint.
...
--HG--
branch : better-diff-on-verbose-2
2014-09-27 01:29:47 +00:00
2eef674615
regen and fix some docs (tox -e regen)
...
bump versions, depend on already released py-1.4.25
2014-09-24 14:46:56 +02:00
bf7c5ea32c
add changelog: check xfail/skip also with non-python function test items. Thanks
...
Floris Bruynooghe.
2014-09-24 13:55:55 +02:00
68105b3ae4
mention Wolfang wrt pytest_enter_pdb
2014-09-23 15:43:46 +02:00
be503f1c43
Merged in wosc/pytest (pull request #204 )
...
Introduce pytest_enter_pdb hook
2014-09-23 14:04:47 +02:00
5abca55412
Merged in nicoddemus/pytest (pull request #203 )
...
fix issue575: xunit-xml reporting collection errors as failures
2014-09-22 19:25:34 +02:00
79d2edcbff
Merged in flub/pytest (pull request #207 )
...
Show both user assertion msg as explanation (issue549)
2014-09-22 19:16:10 +02:00
1408c9f077
Introduce pytest_enter_pdb hook
2014-09-18 14:58:42 +02:00
418607846a
fix issue575: xunit-xml reporting collection errors as failures
2014-09-15 22:04:46 -03:00
b6dcfd4377
fix conftest related fixture visibility issue: when running with a
...
CWD outside a test package pytest would get fixture discovery wrong.
Thanks to Wolfgang Schnerring for figuring out a reproducable example.
--HG--
branch : conftest-nodeid
2014-09-15 12:44:16 +02:00
1a80487e71
fix issue589: fix bad interaction with numpy and others when showing
...
exceptions. check for precise "maximum recursion depth exceed" exception
instead of presuming any RuntimeError is that one (implemented in py dep)
Thanks Charles Cloud for analysing the issue.
2014-09-14 17:24:27 +02:00
4063b7f8e0
Mention PR #194 in the changelog
2014-09-06 00:00:43 +01:00
09a44f4cac
fix issue582: fix setuptools example, thanks Laszlo Papp and Ronny
...
Pfannschmidt.
2014-09-05 15:34:01 +02:00
7dad3cb157
prepare 2.6.2, release announcement, also add HOWTORELEASE.rst
2014-09-05 13:13:23 +02:00
eae1055fb0
Merged in nocoddemus/pytest/cx_freeze-support (pull request #189 )
2014-09-03 21:55:46 +01:00
2e1c36bbb6
merged in flub/pytest (PR #195 )
2014-09-02 12:33:19 +02:00
e3cea41dcd
fix issue572 - python3 compat of tmpdir example in docs.
2014-09-02 12:20:16 +02:00
d4cd1aad8e
improvements to rewrite cache invalidation
...
- stat the source path before it is read.
- Validate the source size in addition to mtime.
2014-09-01 16:51:27 -04:00
068548f7a9
Merged in flub/pytest (pull request #196 )
2014-08-27 21:00:24 +01:00
Floris Bruynooghe
Bruno Oliveira
Eric Hunsberger
Anatoly Bubenkov
Matthias Bussonnier
Kevin Cox
Eric Siegerman
Pieter Mulder
holger krekel (rather uses bitbucket/hpk42)
holger krekel
Florian Bruhin
Andrew Murray
Edison Gustavo Muenz
curzona
Punyashloka Biswal
Ronny Pfannschmidt
Benjamin Peterson
Eduardo Schettino
Brianna Laugher
Almar Klein
Dave Hunt
TomV
Holger Peters
Wolfgang Schnerring