3d89905114
Merge remote-tracking branch 'upstream/master' into features
2017-07-26 19:01:28 -03:00
10ded399d8
Show multiple issue links in CHANGELOG entries
...
Restores the functionality removed in PR #2488 .
2017-07-26 10:58:06 -07:00
abb5d20841
Merge branch 'master' into features
2017-07-20 22:10:58 -03:00
56e6b4b501
Merge pull request #2578 from Llandy3d/2375
...
Provides encoding attribute on CaptureIO
2017-07-20 23:14:14 +02:00
d44565f385
Merge remote-tracking branch 'upstream/master' into fix-flake8-errors
2017-07-19 17:57:30 -03:00
c92760dca8
Merge branch 'fix-flake8-issues'
2017-07-19 17:03:36 -03:00
4fd92ef9ba
Merge branch 'fix-flake8-issues' into features
2017-07-17 21:05:39 -03:00
b2a5ec3b94
updated meta
2017-07-17 02:16:51 +02:00
ba9a76fdb3
Provides encoding attribute on CaptureIO
...
Fix #2375
2017-07-16 14:29:00 +02:00
cc39f41c53
Add myself to AUTHORS as required by the PR help text.
2017-07-15 13:54:18 +02:00
9b9fede5be
allow staticmethods to be detected as test functions
...
Allow a class method decorated `@staticmethod` to be collected as a test
function (if it meets the usual criteria).
This feature will not work in Python 2.6 -- static methods will still be
ignored there.
2017-06-29 07:44:36 -04:00
f74f14f038
Fix --help with required options
...
This works by adding an argparse Action that will raise an exception in
order to skip the rest of the argument parsing. This prevents argparse
from quitting due to missing required arguments, similar to the way that
the builtin argparse --help option is implemented by raising SystemExit.
Fixes : #1999
2017-06-01 21:29:50 +03:00
7950c26a8e
Add Hui Wang to AUTHORS list
2017-05-26 08:09:29 -03:00
bcfa6264f1
Update AUTHORS list
2017-05-12 17:48:50 -03: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
dcefb287fc
Try not to assume a module's file extension is .py
2017-04-19 12:26:56 -07:00
08d83a5c6a
updated changelog and authors files
2017-04-10 17:50:18 +09:00
3aa4fb62d6
Merge branch 'master' into master
2017-04-06 16:35:38 -07:00
8b57aaf944
Added 'Paweł Adamczak' to AUTHORS
2017-03-19 18:38:41 +00:00
9062fbb9cc
Add AUTHORS & CHANGELOG
2017-03-14 18:55:58 -03: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
dd25ae7f33
added in the correct alphabitcal order
2017-03-04 12:50:02 +02:00
02dc545311
added in the correct alphabitcal order
2017-03-04 12:49:00 +02:00
6aaf7ae18b
added to authors and changelog
2017-03-04 10:32:14 +02:00
6ba3475448
Make capsys more like stdio streams in python3. Resolves #1407 .
2017-02-23 17:46:27 -08:00
fb0b90646e
New-style classes implemented for python 2.7 - #2147
2017-02-16 20:28:17 +01:00
00ec30353b
Update docs as requested
2017-02-14 17:08:42 -08: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
3b47cb45e6
Merge pull request #2222 from RonnyPfannschmidt/features
...
merge master into features
2017-01-26 13:48:10 +01:00
713bdc1f9f
merge master into features
2017-01-26 12:00:52 +01:00
839aa963a1
Add py36 identifier
...
and order AUTHORS
2017-01-22 17:13:17 -07:00
c848d0a771
Pass parameter name to `make_parametrize_id` hook function
2017-01-21 16:46:45 +13: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
6d81c684cc
Switch monkeypatch fixture to yield syntax
2017-01-04 15:06:52 -08:00
8db9915374
Update AUTHORS, CHANGELOG
2017-01-02 22:01:04 +00:00
402fbe503a
Merge branch 'master' into merge-master-into-features
2016-12-27 23:31:26 -02:00
bfada968d3
Update AUTHORS and CHANGELOG.rst
...
following contribution guidelines
2016-12-20 14:36:10 +01:00
1f62e5b5a0
Added CHANGELOG entry and myself to AUTHORS.
2016-11-30 11:50:11 +01:00
b30a6d22c5
Merge branch 'master' into merge-master-into-features
2016-11-27 17:30:40 -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
06bb61bbe3
Don't fail if imp can't find the source for a .pyc file. #2038
2016-11-20 13:09:32 -05:00
efc54b2e56
Merge branch 'master' into merge-master-features
2016-11-11 18:56:53 -02:00
Bruno Oliveira
Mihai Capotă
Floris Bruynooghe
Andras Tim
Llandy Riveron Del Risco
Martin Altmayer
Nathaniel Waisbrot
Segev Finer
Dmitri Pribysh
Vitaly Lashmanov
Kodi Arfer
Jonas Obrist
Skylar Downes
Paweł Adamczak
Xander Johnson
fbjorn
Omer Hadari
Anthony Sottile
Michal Wajszczuk
Patrick Hayes
Ran Benita
Vidar Tonaas Fauske
Ronny Pfannschmidt
Ronny Pfannschmidt
Victor Uriarte
Ravi Chandra
Eli Boyarski
mandeep
Jeff Widman
Barney Gale
Loïc Estève
Manuel Krebber
nmundar
Luke Murphy
Duncan Betts
Ned Batchelder