a92e397011
add changelog for fixing #2391
2017-05-12 18:39:45 +02:00
f3b359f5b8
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
...
# Conflicts:
# _pytest/capture.py
# _pytest/compat.py
# _pytest/python.py
# testing/python/collect.py
# testing/test_mark.py
2017-05-03 19:04:53 -03:00
60b8339166
Issue #2383 - Show the correct error message when collect "parametrize" func with wrong args and add test for this case.
2017-04-29 14:32:09 +03:00
25371ddbfd
Merge pull request #2315 from RonnyPfannschmidt/namespace-hook
...
remove pytest internal usage of the namespace hook
2017-04-21 16:24:20 -03:00
dcefb287fc
Try not to assume a module's file extension is .py
2017-04-19 12:26:56 -07:00
83c508eea3
Verify hooks after collection completes
...
Fix #1821
2017-04-11 21:55:12 -03:00
08d83a5c6a
updated changelog and authors files
2017-04-10 17:50:18 +09:00
639c592f31
Add missing link in CHANGELOG
2017-04-06 22:59:24 -03:00
3aa4fb62d6
Merge branch 'master' into master
2017-04-06 16:35:38 -07:00
24ac923938
Add CHANGELOG entry
2017-04-06 12:42:17 -03:00
58ac4faf0c
Fix exception formatting while importing test modules
...
Fix #2336
2017-03-29 14:43:13 -03:00
809c36e1f6
add a changelog note for pytest_namespace
2017-03-28 11:45:06 +02:00
0c1c2580d0
Add CHANGELOG entry
2017-03-22 12:40:31 -03:00
e8a1b36c82
add changelog
2017-03-20 10:21:47 +01:00
aad4946fb6
Move CHANGELOG entry for #2276 to 3.0.8
2017-03-14 18:58:28 -03:00
9062fbb9cc
Add AUTHORS & CHANGELOG
2017-03-14 18:55:58 -03:00
6c9011c12f
Merge branch 'master' into merge-master-into-features-post-3.0.7
2017-03-14 18:10:23 -03:00
fa15ae7545
Post 3.0.7 release handling
2017-03-14 18:07:44 -03:00
b1ab2ca963
Bump to version 3.0.7 and update CHANGELOG
2017-03-13 18:37:49 -04:00
1e0cf5ce4d
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
...
# Conflicts:
# AUTHORS
# CHANGELOG.rst
# _pytest/pytester.py
2017-03-10 15:54:05 -03:00
cee578e327
Fix trailing whitespace in terminal output
2017-03-05 23:20:55 +03:00
f71467f5b1
added link to changelog
2017-03-04 10:55:59 +02:00
6aaf7ae18b
added to authors and changelog
2017-03-04 10:32:14 +02:00
26e50f1162
junitxml: adjust junitxml output file to comply with JUnit xsd
...
Change XML file structure in the manner that failures in call and errors
in teardown in one test will appear under separate testcase elements in
the XML report.
2017-03-02 15:10:25 +01:00
3aac3d0a00
Merge branch 'master' into anydbmfix
2017-03-01 14:41:18 -03:00
6ba3475448
Make capsys more like stdio streams in python3. Resolves #1407 .
2017-02-23 17:46:27 -08:00
d3a6be4130
junitxml: Fix double system-out tags per testcase
...
In the xml report we now have two occurences for the system-out tag if
the testcase writes to stdout both on call and teardown and fails in
teardown.
This behaviour is against the xsd.
This patch makes sure that the system-out section exists only
once per testcase.
2017-02-22 16:39:20 +01:00
fb0b90646e
New-style classes implemented for python 2.7 - #2147
2017-02-16 20:28:17 +01:00
9c809f5ad0
Merge pull request #2255 from scop/spelling
...
Spelling fixes
2017-02-15 18:41:49 -02:00
ede4e9171f
Spelling fixes
2017-02-15 17:00:58 +02:00
91c6bef77a
Add venv to the default norecursedirs
...
venv (without a dot) is commonly used as a name for a virtualenv directory, and
we don't want to collect that.
2017-02-15 14:55:12 +01:00
6b5566db66
Update changelog
2017-02-14 17:47:42 -08:00
49289fed52
Fix docs
2017-02-14 17:21:20 -08:00
00ec30353b
Update docs as requested
2017-02-14 17:08:42 -08:00
9eb1d73951
--override-ini now correctly overrides some fundamental options like "python_files"
...
#2238
2017-02-08 23:03:33 -02:00
6a097aa0f1
Merge branch 'master' into allow_skipping_unittests_with_pdb_active
2017-02-08 20:30:14 -02:00
3a0a0c2df9
Ignore errors raised from descriptors when collecting fixtures
...
Descriptors (e.g. properties) such as in the added test case are
triggered during collection, executing arbitrary code which can raise.
Previously, such exceptions were propagated and failed the collection.
Now these exceptions are caught and the corresponding attributes are
silently ignored.
A better solution would be to completely skip access to all custom
descriptors, such that the offending code doesn't even trigger. However
I think this requires manually going through the instance and all of its
MRO for each and every attribute checking if it might be a proper
fixture before accessing it. So I took the easy route here.
In other words, putting something like this in your test class is still
a bad idea...:
@property
def innocent(self):
os.system('rm -rf /')
Fixes #2234 .
2017-02-07 14:27:34 +02:00
ccf9877447
Merge pull request #2232 from vidartf/patch-1
...
Do not asssume `Item.obj` in 'skipping' plugin
2017-02-03 21:39:42 -02:00
a4d2a5785b
Merge pull request #2142 from barneygale/xfail_without_condition_getglobals
...
'xfail' markers without a condition no longer rely on the underlying `Item` objects deriving from `PyobjMixin`
2017-02-03 16:09:47 -02:00
1a88a91c7a
Update authors/history
2017-02-03 16:29:43 +01:00
43662ce789
allow error message matching in pytest.raises
2017-02-02 19:52:33 +01:00
176c680e19
Merge branch 'master' into allow_skipping_unittests_with_pdb_active
2017-02-01 15:53:14 -02:00
e1c5314d80
Replace 'raise StopIteration' usages in the code by 'return's in accordance to PEP-479
...
Fix #2160
2017-02-01 02:37:55 -02:00
d1c725078a
Allow to skip unittests if --pdb active
...
closes #2137
2017-01-31 04:47:31 +01:00
3b47cb45e6
Merge pull request #2222 from RonnyPfannschmidt/features
...
merge master into features
2017-01-26 13:48:10 +01:00
3f30c22894
fix changelog merge mistake
2017-01-26 13:03:29 +01:00
713bdc1f9f
merge master into features
2017-01-26 12:00:52 +01:00
beb77c1a38
Fix release date for 3.0.6
2017-01-23 13:51:12 -02:00
c9f327dc87
bump version to next dev
2017-01-22 22:21:08 +01:00
55f21bd2b9
bump version
2017-01-22 18:44:30 +01:00
0e58c3fa80
updates for PR review #2198
2017-01-21 16:47:49 +13:00
c848d0a771
Pass parameter name to `make_parametrize_id` hook function
2017-01-21 16:46:45 +13:00
15a3b57ec7
Merge pull request #2120 from RonnyPfannschmidt/fix-2118
...
fix #2118 - rework Node._getcustomclass and Node compat properties
2017-01-20 14:38:55 -02:00
6a96b464ab
update changelog as suggested
2017-01-20 15:26:59 +01:00
3766060893
Merge branch 'master' into trial-envs
2017-01-20 08:37:34 -02:00
e0c48b4fe7
Merge pull request #2212 from nicoddemus/pytester-rewrite
...
Assert statements of the pytester plugin again benefit from assertion rewriting
fixes #1920
2017-01-20 10:04:12 +01:00
7b4368f3f4
Merge pull request #2184 from eli-b/parseoutcomes-explicit-failure
...
Fail assert_outcomes() on missing terminal report
2017-01-19 21:38:54 -02:00
c477f09177
Assert statements of the pytester plugin again benefit from assertion rewriting
...
Fix #1920
2017-01-19 21:33:51 -02:00
2574da8d32
Fix pytester internal plugin to work correctly with latest versions of zope.interface
...
Fix #1989
2017-01-19 20:53:35 -02:00
123289a88e
fixes #2208 by introducing a iteration limit
2017-01-19 11:38:15 +01:00
043aadeaf2
Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite
...
Fix #2185
2017-01-11 17:15:16 -02:00
e18b2a427a
Fail assert_outcomes() on missing terminal report
...
Currently if the terminal report of testdir.runpytest() is missing,
assert_outcomes() on its output fails because parseoutcomes()
returns an unexpected value (None).
It's better to fail parseoutcomes() directly.
2017-01-11 17:09:37 +02:00
e412ea1d5a
Added name to AUTHORS and change to CHANGELOG
2017-01-10 07:58:22 -06:00
3494dd06fe
Remove duplicate target in rst
2017-01-03 10:57:19 -02:00
56d1858ea2
Remove duplicate '@lesteve' link from CHANGELOG
2017-01-03 10:57:19 -02:00
6fd0394c63
pytest.warns checks for subclass relationship
...
rather than class equality. This makes it more similar to
pytest.raises.
2017-01-03 10:57:19 -02:00
df409a0c0e
Fix CHANGELOG.rst
2017-01-02 22:01:40 +00:00
8db9915374
Update AUTHORS, CHANGELOG
2017-01-02 22:01:04 +00:00
a9193a1531
No longer silently ignore errors in parametrize callable ids
2017-01-02 17:26:17 -02:00
03a7a2cd3e
Fix typos
2016-12-31 19:01:15 +01:00
402fbe503a
Merge branch 'master' into merge-master-into-features
2016-12-27 23:31:26 -02:00
7592c5b491
Sort issues and user references in CHANGELOG
2016-12-27 23:20:34 -02:00
718f0b0255
Merge pull request #2130 from malinoff/fix-2129
...
Use inspect to properly detect generators. Fixes #2129
2016-12-27 22:11:46 -02:00
0bb8a4a36d
Fixed #2148 - parse directory names properly when args contains ::.
...
This commit also improves readbility in get_dirs_from_args by using self
documenting local functions.
get_dirs_from_args also now only returns directories that actually exists,
and not files to avoid confusion.
This commit also removes redundant checks in get_common_ancestor that
was already performed in get_dirs_from_args..
2016-12-27 15:28:56 +01:00
bfada968d3
Update AUTHORS and CHANGELOG.rst
...
following contribution guidelines
2016-12-20 14:36:10 +01:00
1312b83866
Add CHANGELOG entry for #2129
2016-12-13 21:33:01 -02:00
9c285dfc1d
fix #2118 - rework Node._getcustomclass and Node compat properties
2016-12-06 09:13:25 +01:00
8afca5d0fa
Add release dates to CHANGELOG entry
...
Fix #721
2016-12-05 17:21:01 -02:00
3a0a1d2de3
Bump version to 3.0.6.dev0
2016-12-05 12:51:00 -02:00
833acb9d3c
Finalize CHANGELOG for 3.0.5
2016-12-05 10:07:37 -02:00
57c4489916
Use a simple ``+-`` ASCII string in the string representation of pytest.approx In Python 2
...
Fix #2111
2016-12-02 20:01:53 -02:00
81528ea81f
Remove hook proxy cache
...
Fix #2016
2016-12-02 07:32:11 -02:00
bc0f7e6243
Fix false-positive assert rewrite warnings when using 'pytest_plugins'
...
pytest would emit false positive warnings about assertion-rewrite when a
module appears multiple times in plugins which depend
on other plugins using the 'pytest_plugins' mechanism
2016-12-01 15:50:08 -02:00
c856537e71
Add warning for incorrect passing args to `-o`.
2016-12-01 13:20:42 +01:00
f8d195253e
Remove support code for earlier Python 3 version in Source.compile
...
This code leaves None in sys.modules as a side effect but is no longer needed in the Python 3 versions we support.
Fix #2103
2016-11-30 22:23:02 -02:00
669332b7e0
Merge pull request #2101 from wheerd/doctest-encoding
...
Added doctest encoding command line option
2016-11-30 17:43:42 -02:00
f5afd8cb54
Add missing `__test__` check for test discovery.
2016-11-30 17:05:42 +01:00
1f62e5b5a0
Added CHANGELOG entry and myself to AUTHORS.
2016-11-30 11:50:11 +01:00
8208a77a3e
Merge pull request #2098 from DuncanBetts/master
...
Improved description of functionality for Issue #687
2016-11-28 23:05:27 -02:00
6473c3d87e
Improved description of functionality for Issue #687
2016-11-28 14:30:25 +00:00
4e1609b12e
Add `type` validation.
...
Argparse driven argument type validation is added for the
`--junit-xml` and `--confcutdir` arguments.
The commit partially reverts #2080 . Closes #2089 .
2016-11-28 02:16:01 +01:00
b30a6d22c5
Merge branch 'master' into merge-master-into-features
2016-11-27 17:30:40 -02:00
2d7197926a
Improve CHANGELOG entry for #2034
2016-11-27 14:26:30 -02:00
0e6ad8e59f
update CHANGELOG and AUTHORS
2016-11-27 14:24:55 -02:00
1aa5bfea11
Add `:ref:` targets to `recwarn.rst`.
2016-11-26 18:41:38 +01:00
c1b83cdeea
Add hint of Issue #478 to error text
2016-11-26 10:47:15 +00:00
33c0b06fdf
Fix error in approx's repr with complex numbers
...
Fix #2082
2016-11-24 15:33:12 -02:00
629d8e9fd6
Show an error if --confcutdir is not a valid directory
...
Fixes #2078
2016-11-23 09:49:11 -02:00
5ce551e469
Merge pull request #2075 from pytest-dev/master
...
Merge master into features after fixing flake8 errors
2016-11-22 14:10:31 -02:00
06bb61bbe3
Don't fail if imp can't find the source for a .pyc file. #2038
2016-11-20 13:09:32 -05:00
Ronny Pfannschmidt
Bruno Oliveira
Vitaly Lashmanov
Kodi Arfer
Jonas Obrist
Skylar Downes
Xander Johnson
fbjorn
Omer Hadari
Katerina Koukiou
Anthony Sottile
Michal Wajszczuk
Ville Skyttä
Florian Bruhin
Patrick Hayes
Ran Benita
Vidar Tonaas Fauske
Thomas Kriechbaumer
mbyt
Ronny Pfannschmidt
Ravi Chandra
Eli Boyarski
mandeep
Loïc Estève
Barney Gale
Rafael Bertoldi
Jakub Wilk
Andreas Pelme
Luke Murphy
Manuel Krebber
Duncan Betts
nmundar
Ned Batchelder