Thomas Hisch
af75ca435b
Fix some coding-style issues in the logging plugin
2017-10-12 02:19:24 +02:00
Thomas Hisch
775f4a6f2f
Fix flake8 issue
2017-10-12 02:19:24 +02:00
Thomas Hisch
0e83511d6d
Rename name of registered logging plugin
2017-10-12 02:19:24 +02:00
Thomas Hisch
1f3ab118fa
Remove usage of get_logger_obj
2017-10-12 02:19:24 +02:00
Thomas Hisch
0ec72d0745
Improve get_option_ini and get_actual_log_level
2017-10-12 02:19:24 +02:00
Dirk Thomas
66e9a79472
get PYTEST_ADDOPTS before calling _initini
2017-10-11 09:38:44 -07:00
hugovk
ef732fc51d
Remove code for unsupported Python versions
2017-10-10 08:54:56 +03:00
Ronny Pfannschmidt
dd45f8ba6c
Merge pull request #2822 from RonnyPfannschmidt/nomore-py26
...
Nomore py26
2017-10-10 07:00:08 +02:00
Ronny Pfannschmidt
c486598440
remove some support code for old python versions
2017-10-09 17:25:13 +02:00
Bruno Oliveira
059455b45d
Merge pull request #2773 from RonnyPfannschmidt/fix-markeval-2767
...
refactor mark evaluators
2017-10-09 12:17:15 -03:00
Ronny Pfannschmidt
9b0ce535c9
Merge pull request #2801 from nicoddemus/capture-fixture
...
Allow fixtures to use capsys and capfd
2017-10-09 15:26:50 +02:00
Leonard Lausen
e89abe6a40
Defensive fallback in case of kwargs not being present
2017-10-09 00:37:27 +09:00
Leonard Lausen
c24ffa3b4c
Fix pytest.parametrize when argnames are specified as kwarg
2017-10-08 12:23:26 +09:00
Ronny Pfannschmidt
459cc40192
skipping: cleanup
...
remove dead comments
fix naming
remove dead code
2017-10-06 10:44:49 +02:00
Ronny Pfannschmidt
e3b73682b2
flake8 fix
2017-10-06 10:44:49 +02:00
Ronny Pfannschmidt
8480075f01
resuffle markevaluator internal structure
2017-10-06 10:44:49 +02:00
Ronny Pfannschmidt
9ad2b75038
skipping: replace _evalskip with a more consistent _skipped_by_mark
2017-10-06 10:44:49 +02:00
Ronny Pfannschmidt
a33650953a
remove unused import
2017-10-06 10:44:49 +02:00
Ronny Pfannschmidt
667e70f555
switch out the placeholder MarkEvaluator in unittest plugin
2017-10-06 10:44:49 +02:00
George Y. Kussumoto
03ce0adb79
Fix: handle CollectReport in folded_skips function
2017-10-04 19:18:55 -03:00
Bruno Oliveira
e7a4d3d8cf
Merge remote-tracking branch 'upstream/master' into features
2017-10-04 17:28:34 -03:00
Bruno Oliveira
df6d5cd4e7
Use ascii_escaped to escape unicode warnings
2017-10-03 12:19:37 -03:00
Bruno Oliveira
fbb9e9328b
Fix warning about non-ascii warnings even when they are ascii
...
Fix #2809
2017-10-03 07:39:53 -03:00
George Y. Kussumoto
c1aa63c0bb
Fix docstring alignment and typos
2017-10-02 21:24:52 -03:00
George Y. Kussumoto
79d3353081
Add allow_module_level kwarg to skip helper
2017-10-02 21:07:21 -03:00
Xuan Luong
7093d8f65e
Add example of -k 'not test' in help text
2017-09-30 18:43:20 -04:00
Bruno Oliveira
f9589f7b64
Resume output capturing after capsys/capfd.disabled() context manager
...
Fix #1993
2017-09-29 17:24:31 -03:00
Christian Boelsen
794d4585d3
Remove unnecessary complexity in _check_initialpaths_for_relpath().
2017-09-28 20:53:50 +01:00
Bruno Oliveira
3b30c93f73
Deprecate TerminalReporter._tw
...
Fix #2803
2017-09-27 17:16:34 -03:00
Bruno Oliveira
22f338d74d
Refactor some names for better understanding and consistency
2017-09-26 20:09:42 -03:00
Bruno Oliveira
9919269ed0
Allow to use capsys and capfd in other fixtures
...
Fix #2709
2017-09-26 20:09:36 -03:00
Thomas Hisch
ad21d5cac4
Remove pytest-capturelog backward compat code
2017-09-26 23:24:27 +02:00
Thomas Hisch
2559ec8bdb
use 'formatter' kwarg of catching_logs
2017-09-22 22:27:50 +02:00
Thomas Hisch
207f153ec1
Remove logging_at_level ctx manager
2017-09-22 22:27:50 +02:00
Thomas Hisch
3a4011585f
catching_logs: Remove usage of 'closing' ctx manager
...
The 'closing' context manager is only needed for the log_file_handler.
2017-09-22 22:27:50 +02:00
Thomas Hisch
57f66a455a
catching_logs: Remove unused 'filter' kwarg
2017-09-22 22:27:50 +02:00
Thomas Hisch
e41fd52e8c
Introduce live_logs context manager
2017-09-22 22:27:50 +02:00
Thomas Hisch
08f6b5f4ea
Use pytest.hookimpl instead of pytest.mark.hookwrapper
...
pytest.mark.hookwrapper seems to be used nowhere in the _pytest package.
2017-09-22 22:27:50 +02:00
Thomas Hisch
d13e17cf51
Don't modify the 'config' object in __init__
2017-09-22 22:27:50 +02:00
Thomas Hisch
f1f6109255
Remove _catchlog_ prefix
2017-09-22 22:27:50 +02:00
Thomas Hisch
87b8dc5afb
Move 'config' handling from pytest_configure to __init__
2017-09-22 22:27:50 +02:00
Thomas Hisch
fc965c1dc5
Remove outdated docstring
2017-09-22 22:27:50 +02:00
Thomas Hisch
a1bd54e4ea
Clean-up LogCaptureHandler
2017-09-22 22:27:50 +02:00
Thomas Hisch
36cceeb10e
Set type of log_print ini-variable to 'bool'
2017-09-22 22:27:50 +02:00
Thomas Hisch
98209e92ee
Remove superfluous whitespace in docstring
2017-09-22 22:27:50 +02:00
Thomas Hisch
1bea7e6985
Cleanup pytest_addoption
2017-09-22 22:27:50 +02:00
Thomas Hisch
6607478b23
Add unittests for LoggingPlugin (excluding perf tests)
2017-09-22 22:27:49 +02:00
Thomas Hisch
8eafbd05ca
Merge the pytest-catchlog plugin
2017-09-22 22:27:49 +02:00
Ofir
062a0e3e68
If an exception happens while loading a plugin, PyTest no longer hides the original traceback.
...
In python2 it will show the original traceback with a new message that explains in which plugin.
In python3 it will show 2 canonized exceptions, the original exception while loading the plugin in addition to an exception that PyTest throws about loading a plugin.
2017-09-19 15:14:08 +03:00
Oliver Bestwalter
2802135741
fix 'DoctestItem' object has no attribute '_fixtureinfo'
...
* doxtests don't seem to have this attribute, so nothing will be written in that case.
* tried to be a good boy scout and tidied up surrounding code a bit (comments, shadowed/unused names, removed random new lines, naming things)
2017-09-19 12:41:12 +02:00
Bruno Oliveira
3ebfb881c9
Merge remote-tracking branch 'upstream/master' into features
2017-09-18 19:10:31 -03:00
Bruno Oliveira
ac5c5cc1ef
Merge pull request #2750 from evanunderscore/fix-filescompleter
...
Fix crash in FastFilesCompleter with no prefix
2017-09-14 20:11:43 -03:00
Christian Boelsen
14b6380e5f
Fix #2775 - running pytest with "--pyargs" will result in Items with empty "parent.nodeid" if run from a different root directory
2017-09-13 17:15:32 +01:00
Xuan Luong
1e93089165
[bugfix] Checking MarkDecorator equality returns False for non-MarkDecorator object
2017-09-09 01:31:08 -04:00
Bruno Oliveira
9273e11f21
Merge branch 'master' into features
2017-09-07 13:59:10 -03:00
Evan
6cf515b164
Fix crash in FastFilesCompleter with no prefix
2017-09-08 00:14:56 +10:00
Ronny Pfannschmidt
6967f3070e
Merge pull request #2711 from massich/mimic_raises_signature_in_warns
...
[MRG][feature] Change warns signature to mimic the raises call
2017-09-07 13:19:09 +02:00
Joan Massich
80d165475b
Add documentation
2017-09-07 10:28:52 +02:00
Joan Massich
aa6a67044f
Add match_regex functionality to warns
2017-09-07 09:58:03 +02:00
Bruno Oliveira
d01f08e96f
Merge branch 'features' into pluggy-master
2017-09-06 13:13:35 -03:00
Ronny Pfannschmidt
ad36407747
Merge pull request #2700 from nicoddemus/staticmethods-fixtures
...
Allow tests declared as @staticmethod to use fixtures
2017-09-06 08:24:00 +02:00
Bruno Oliveira
e1f2254fc2
Merge pull request #2734 from RonnyPfannschmidt/simplify-string-safening
...
simplyfy ascii escaping by using backslashreplace error handling
2017-09-05 21:14:27 -03:00
Bruno Oliveira
f825b4979b
Merge remote-tracking branch 'upstream/master' into features
2017-09-05 19:44:33 -03:00
Bruno Oliveira
1fc185b640
Add comment about possible future refactoring in the fixture mechanism
2017-09-05 19:28:39 -03:00
Tarcisio Fischer
8d1903fed3
Avoid creating arbitrary filenames for tmpdir on Testdir's constructor
...
Fixes #2751
2017-09-05 15:22:04 -03:00
Ronny Pfannschmidt
13eac944ae
restore ascii escaping for python 3.3/3.4
2017-09-04 21:25:46 +02:00
Bruno Oliveira
3dc0da9339
Remove __multicall__ warning and usages in testing
...
pluggy>=0.5 already warns about those
2017-09-01 18:53:06 -03:00
Ronny Pfannschmidt
181bd60bf9
Merge pull request #2742 from nicoddemus/resultlog-deprecation
...
Improve user guidance regarding ``--resultlog`` deprecation
2017-09-01 08:29:41 +02:00
Bruno Oliveira
3288c9a110
Improve user guidance regarding ``--resultlog`` deprecation
...
Fix #2739
2017-08-31 19:11:41 -03:00
Bruno Oliveira
221797c609
Encode utf-8 byte strings in pytester's makefile
...
Fix #2738
2017-08-31 18:49:06 -03:00
Ronny Pfannschmidt
5e00549ecc
Merge pull request #2735 from fgmacedo/fgm-fix-reprfuncargs-toterminal
...
2731.bug Fix ReprFuncArgs with mixed unicode and utf-8 args.
2017-08-31 09:36:56 +02:00
Fernando Macedo
59cdef92be
fixes #2731 ReprFuncArgs with mixed unicode and utf-8 args
2017-08-30 16:06:12 -03:00
Ronny Pfannschmidt
78a027e128
simplyfy ascii escaping by using backslashreplace error handling
2017-08-30 16:43:16 +02:00
Tyler Goodlet
ff35c17ecf
Drop wrapper module; import directly
2017-08-25 11:46:55 -04:00
Tyler Goodlet
9ab83083d1
Update docs
2017-08-24 16:53:37 -04:00
Tyler Goodlet
333a9ad7fa
Stop vendoring pluggy
...
Resolves #2716
2017-08-24 15:54:33 -04:00
Kirill Pinchuk
12b1bff6c5
`compat.safe_getattr` now catches OutcomeExceptions too
2017-08-23 17:17:03 +03:00
Bruno Oliveira
a993add783
Allow tests declared as @staticmethod to use fixtures
...
Fix #2699
2017-08-17 20:44:19 -03:00
Bruno Oliveira
f18780ed8a
Update docs: ``match`` keyword was introduced in 3.1
...
Also update the text to recommend using the context-manager
over the callable/string forms.
2017-08-16 14:28:34 -03:00
Ronny Pfannschmidt
5c0feb2877
Merge pull request #2680 from prokaktus/skipping-same-module
...
Fold skipped tests with global pytestmark variable
2017-08-15 10:52:24 +02:00
prokaktus
98bf5fc9be
Fold skipped tests with global pytestmark variable
2017-08-15 02:18:46 +03:00
Andreas Pelme
39331856ed
Use the correct stacklevel for getfuncargvalue() deprecation warning.
...
Fixed #2681 .
2017-08-13 14:59:33 +02:00
Ronny Pfannschmidt
eb462582af
fix #2675 - store marks correctly in callspecs
2017-08-10 19:46:36 +02:00
Bruno Oliveira
cc0f2473eb
Fix windows console workaround error with non-standard io-streams
...
Fix #2666
2017-08-07 20:57:13 -03:00
Srinivas Reddy Thatiparthy
a0101f024e
remove os.sep as it behaves differently linux and windows.
...
* on linux it is '/'
* on windows it is '\'
2017-08-05 23:21:43 +05:30
Ronny Pfannschmidt
9e62a31b63
Merge pull request #2650 from srinivasreddy/2642
...
Fixed#2642: Convert py module references to six module
2017-08-04 09:21:51 +02:00
Srinivas Reddy Thatiparthy
dc563e4954
convert py module references to six module
2017-08-04 08:05:03 +05:30
Bruno Oliveira
ad52f714a9
Fix small terminal glitch when collecting a single test item
...
Fix #2579
2017-08-03 20:57:46 -03:00
Bruno Oliveira
7703dc921c
Only skip null bytes before setting the environment variable
...
As discussed, node ids have already been "ascii" sanitized by the
parametrization process
2017-08-02 10:27:45 -03:00
Bruno Oliveira
1deac2e210
Properly escape test names when setting PYTEST_CURRENT_TEST environment variable
...
Fix #2644
2017-08-01 20:52:37 -03:00
Ronny Pfannschmidt
6e7547244b
Merge pull request #2636 from RonnyPfannschmidt/remove-preinit
...
remove preinit, its no longer needed
2017-08-01 05:22:41 +02:00
Bruno Oliveira
8a2e6a8d51
Fix linting
2017-07-31 16:49:30 -03:00
Ronny Pfannschmidt
74d536314f
pytester: make pytest fullpath a constant
2017-07-31 18:18:53 +02:00
Ronny Pfannschmidt
ceb016514b
remove dead code - Node._memoizedcall
2017-07-31 18:18:26 +02:00
Ronny Pfannschmidt
e90f876b34
remove the last own implementation of pytest_namespace
2017-07-31 13:48:25 +02:00
Ronny Pfannschmidt
c68a89b4a7
remove preinit, its no longer needed
2017-07-31 13:44:05 +02:00
Bruno Oliveira
763c580a2a
Merge pull request #2576 from maiksensi/feat/raise-not-implemented-for-lt-gt-in-approx
...
#2003 Change behavior of `approx.py` to only support `__eq__` comparison
2017-07-30 17:48:33 -03:00
Bruno Oliveira
e1aed8cb17
Merge pull request #2490 from RonnyPfannschmidt/fix-580
...
Test Outcomes as BaseException - fix #580
2017-07-30 17:38:42 -03:00
Bruno Oliveira
713f7636e1
Merge pull request #2632 from jmoldow/pep_0415_suppress_exception_context
...
Support PEP-415's Exception.__suppress_context__
2017-07-30 17:22:40 -03:00
Bruno Oliveira
4cd8727379
Merge pull request #2617 from wence-/fix/nondeterministic-fixtures
...
Fix nondeterminism in fixture collection order
2017-07-30 17:17:40 -03:00
Jordan Moldow
2e61f702c0
Support PEP-415's Exception.__suppress_context__
...
PEP-415 states that `exception.__context__` should be suppressed
in traceback outputs, if `exception.__suppress_context__` is
`True`.
Now if a ``raise exception from None`` is caught by pytest,
pytest will no longer chain the context in the test report.
The algorithm in `FormattedExcinfo` now better matches the one
in `traceback.TracebackException`.
`Exception.__suppress_context__` is available in all of the
versions of Python 3 that are supported by pytest.
Fixes #2631 .
2017-07-29 02:39:17 -07:00
Ronny Pfannschmidt
be401bc2f8
fix linting issues
2017-07-28 18:27:59 +02:00
Ronny Pfannschmidt
06a49338b2
make Test Outcomes inherit from BaseException instead of exception
...
fixes #580
2017-07-28 15:28:51 +02:00
Bruno Oliveira
7a12acb6a1
Fix linting
2017-07-28 08:54:55 -03:00
Bruno Oliveira
5acb64be90
Add versionadded tag to pytest_report_collectionfinish hook
2017-07-28 08:54:55 -03:00
Bruno Oliveira
75e6f7717c
Use new hook to report accurate tests skipped in --lf and --ff
2017-07-28 08:54:55 -03:00
Bruno Oliveira
eb1bd3449e
xfail and skipped tests are removed from the "last-failed" cache
...
This accommodates the case where a failing test is marked as
skipped/failed later
2017-07-27 18:43:04 -03:00
Bruno Oliveira
62810f61b2
Make cache plugin always remember failed tests
2017-07-27 14:40:21 -03:00
Bruno Oliveira
17c544e793
Introduce new pytest_report_collectionfinish hook
...
Fix #2622
2017-07-27 10:44:29 -03:00
Bruno Oliveira
3d89905114
Merge remote-tracking branch 'upstream/master' into features
2017-07-26 19:01:28 -03:00
Lawrence Mitchell
a546a612bd
Fix nondeterminism in fixture collection order
...
fixtures.reorder_items is non-deterministic because it reorders based
on iteration over an (unordered) set. Change the code to use an
OrderedDict instead so that we get deterministic behaviour, fixes #920 .
2017-07-26 14:41:10 +01:00
Bruno Oliveira
dd294aafb3
Merge pull request #2557 from blueyed/EncodedFile-name
...
capture: ensure name of EncodedFile being a string
2017-07-26 10:39:10 -03:00
Bruno Oliveira
2c2cf81d0a
Merge pull request #2580 from andras-tim/fix-runpytest-subprocess
...
Avoid interactive pdb when pytest tests itself - fix #2023
2017-07-26 10:37:48 -03:00
Bruno Oliveira
80f4699572
approx raises TypeError in Python 2 for comparison operators other than != and ==
2017-07-25 20:07:10 -03:00
Maik Figura
57a232fc5a
Remove out of scope change
2017-07-25 19:19:14 -03:00
Maik Figura
f0936d42fb
Fix linter errors
2017-07-25 19:17:58 -03:00
Maik Figura
d3ab1b9df4
Add user documentation
...
The new doc section explains why we raise a `NotImplementedError`.
2017-07-25 19:17:58 -03:00
Daniel Hahler
0603d1d500
capture: ensure name of EncodedFile being a string
...
Fixes https://github.com/pytest-dev/pytest/issues/2555 .
2017-07-25 20:37:37 +02:00
Bruno Oliveira
595ecd23fd
Merge pull request #2548 from blueyed/skip-fix-lineno
...
Fix lineno offset in show_skipped
2017-07-25 13:35:14 -03:00
Daniel Hahler
869eed9898
Fix lineno offset in show_skipped
...
The line number is 0-based here, so add 1.
2017-07-25 15:19:47 +02:00
Daniel Hahler
72531f30c0
Improve error message for CollectError with skip/skipif
2017-07-25 15:14:28 +02:00
Bruno Oliveira
73c6122f35
Merge remote-tracking branch 'upstream/master' into features
2017-07-24 21:12:51 -03:00
Bruno Oliveira
70d9f8638f
Merge pull request #2610 from AgriConnect/doctest-lineno
...
Report lineno from doctest
2017-07-24 16:29:02 -03:00
Bruno Oliveira
e44284c125
Merge pull request #2611 from segevfiner/patch-1
...
Early import colorama so that it get's the correct terminal
2017-07-24 12:37:22 -03:00
Nguyễn Hồng Quân
cdaa720bc4
Merge remote-tracking branch 'upstream/master' into doctest-lineno
2017-07-24 21:49:35 +07:00
Segev Finer
d0ecfdf00f
Delete trailing whitespace
2017-07-24 16:55:50 +03:00
Florian Bruhin
81ad185f0d
Merge pull request #2595 from nicoddemus/docs-rootdir-pythonpath
...
Clarify PYTHONPATH changes and ``rootdir`` roles
2017-07-24 15:06:38 +02:00
Segev Finer
43544a431c
Early import colorama so that it get's the correct terminal
2017-07-24 15:17:39 +03:00
Nguyễn Hồng Quân
af2c153324
Report lineno from doctest
...
This is to fix pytest-sugar#122 issue.
2017-07-24 11:52:24 +07:00
Bruno Oliveira
1b732fe361
Merge pull request #2606 from kalekundert/simplify-numpy
...
Make approx more compatible with numpy
2017-07-22 14:21:08 -03:00
Kale Kundert
7e0553267d
Remove unused import.
2017-07-22 09:19:13 -07:00
Kale Kundert
ebc7346be4
Raise TypeError for types that can't be compared to arrays.
2017-07-22 09:05:12 -07:00
Kale Kundert
a3b35e1c4b
Remove `raises` and `approx` from `python.py`.
...
These two classes were recently moved to `python_api.py`, but it seems
that they found their way back into the original file somehow. This
commit removes them again to avoid out-of-date code duplication.
2017-07-22 08:36:15 -07:00
Kale Kundert
495f731760
Simplify how comparisons with numpy arrays work.
...
Previously I was subverting the natural order of operations by
subclassing from `ndarray`, but it turns out that you can tell just
numpy to call your operator instead of its by setting the
`__array_priority__` attribute on your class. This is much simpler, and
it turns out the be a little more robust, too.
2017-07-22 07:52:03 -07:00
Andras Tim
50764d9ebb
Avoid interactive pdb when pytest tests itself - fix #2023
...
The debugging.py calls post_mortem() on error and pdb will drops an
interactive debugger when the stdin is a readable fd.
2017-07-21 21:29:03 +02:00
Bruno Oliveira
6461dc9fc6
Merge pull request #2600 from RonnyPfannschmidt/mark_explicit_params
...
fix #2540 , introduce mark.with_args
2017-07-21 10:42:25 -03:00
Daniel Hahler
97e5a3c889
Fix help for filterwarnings ini option
2017-07-21 14:21:31 +02:00
Ronny Pfannschmidt
65b2de13a3
fix #2540 , introduce mark.with_args
2017-07-21 13:37:09 +02:00
Bruno Oliveira
3d24485cae
Clarify PYTHONPATH changes and ``rootdir`` roles
...
- Also minor adjustments in the docs (wording, formatting, links, etc).
Fix #2589
2017-07-21 07:28:11 -03:00
Bruno Oliveira
7341da1bc1
Introduce pytest.mark.filterwarnings
2017-07-20 22:31:49 -03:00
Bruno Oliveira
abb5d20841
Merge branch 'master' into features
2017-07-20 22:10:58 -03:00
Bruno Oliveira
da12c52347
Fix: do not load hypothesis during test_logging_initialized_in_test
...
A recent release seem to have added a "logging" import to the top-level,
which breaks test_logging_initialized_in_test
2017-07-20 21:43:24 -03:00
Floris Bruynooghe
56e6b4b501
Merge pull request #2578 from Llandy3d/2375
...
Provides encoding attribute on CaptureIO
2017-07-20 23:14:14 +02:00
Bruno Oliveira
d44565f385
Merge remote-tracking branch 'upstream/master' into fix-flake8-errors
2017-07-19 17:57:30 -03:00
Bruno Oliveira
26ee2355d9
Merge remote-tracking branch 'upstream/features' into fix-flake8-errors
2017-07-19 17:09:05 -03:00
Bruno Oliveira
c92760dca8
Merge branch 'fix-flake8-issues'
2017-07-19 17:03:36 -03:00
Florian Bruhin
eb79fa7825
Merge pull request #2590 from nicoddemus/current-test-var
...
Introduce new PYTEST_CURRENT_TEST environment variable
2017-07-19 15:56:32 +02:00
Bruno Oliveira
2d4f1f022e
Introduce PYTEST_CURRENT_TEST environment variable
...
Fix #2583
2017-07-19 10:01:50 -03:00
Ronny Pfannschmidt
62556bada6
remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage
...
fixes #2573
2017-07-19 08:44:52 +02:00
Bruno Oliveira
bd96b0aabc
Remove _pytest/impl file
...
The file apparently contains an early design document to what
has become @pytest.fixture and can be deleted
2017-07-18 09:47:06 -03:00
Bruno Oliveira
7b1870a94e
Fix flake8 in features branch
2017-07-17 21:16:14 -03:00
Bruno Oliveira
4fd92ef9ba
Merge branch 'fix-flake8-issues' into features
2017-07-17 21:05:39 -03:00
Andras Tim
b49e8baab3
Fixed E731 flake8 errors
...
do not assign a lambda expression, use a def
2017-07-17 01:44:23 +02:00
Andras Tim
15610289ac
Fixed E712 flake8 errors
...
comparison to True should be ‘if cond is True:’ or ‘if cond:’
2017-07-17 01:44:23 +02:00
Andras Tim
5ae59279f4
Fixed E704 flake8 errors
...
multiple statements on one line (def)
2017-07-17 01:44:23 +02:00
Andras Tim
7d2ceb7872
Fixed E501 flake8 errors
...
line too long (> 120 characters)
2017-07-17 01:44:23 +02:00
Andras Tim
45ac863069
Fixed E401 flake8 errors
...
multiple imports on one line
2017-07-17 01:44:23 +02:00
Andras Tim
7248b759e8
Fixed E303 flake8 errors
...
too many blank lines (3)
2017-07-17 01:44:23 +02:00
Andras Tim
b840622819
Fixed E302 flake8 errors
...
expected 2 blank lines, found 0
2017-07-17 01:44:23 +02:00
Andras Tim
17a21d540b
Fixed E301 flake8 errors
...
expected 1 blank line, found 0
2017-07-17 01:44:23 +02:00
Andras Tim
c9a081d1a3
Fixed E271 flake8 errors
...
multiple spaces after keyword
2017-07-17 01:44:22 +02:00
Andras Tim
195a816522
Fixed E265 flake8 errors
...
block comment should start with ‘# ‘
2017-07-17 01:44:22 +02:00
Andras Tim
8f3eb6dfc7
Fixed E261 flake8 errors
...
at least two spaces before inline comment
2017-07-17 01:44:22 +02:00
Andras Tim
b226454582
Fixed E251 flake8 errors
...
unexpected spaces around keyword / parameter equals
2017-07-17 01:44:22 +02:00
Andras Tim
4c24947785
Fixed E241 flake8 errors
...
multiple spaces after ‘,’
2017-07-17 01:44:22 +02:00
Andras Tim
617e510b6e
Fixed E231 flake8 errors
...
missing whitespace after ‘,’, ‘;’, or ‘:’
2017-07-17 01:44:22 +02:00
Andras Tim
4b22f270a3
Fixed E226 flake8 errors
...
missing whitespace around arithmetic operator
2017-07-17 01:44:22 +02:00
Andras Tim
2e8caefcab
Fixed E225 flake8 errors
...
missing whitespace around operator
2017-07-17 01:44:22 +02:00
Andras Tim
3fabc4d219
Fixed E222 flake8 errors
...
multiple spaces after operator
2017-07-17 01:44:22 +02:00
Andras Tim
f640e0cb04
Fixed E221 flake8 errors
...
multiple spaces before operator
2017-07-17 01:44:22 +02:00
Andras Tim
ba0a4d0b2e
Fixed E202 flake8 errors
...
whitespace before ‘)’
2017-07-17 01:28:17 +02:00
Andras Tim
1ff54ba205
Fixed E201 flake8 errors
...
whitespace after ‘(‘
2017-07-17 01:28:17 +02:00
Andras Tim
df54bf0db5
Fixed E131 flake8 errors
...
continuation line unaligned for hanging indent
2017-07-17 01:28:16 +02:00
Andras Tim
1c935db571
Fixed E129 flake8 errors
...
visually indented line with same indent as next logical line
2017-07-17 01:28:16 +02:00
Andras Tim
cf97159009
Fixed E128 flake8 errors
...
continuation line under-indented for visual indent
2017-07-17 01:28:16 +02:00
Andras Tim
57438f3efe
Fixed E127 flake8 errors
...
continuation line over-indented for visual indent
2017-07-17 01:28:16 +02:00
Andras Tim
e855a79dd4
Fixed E126 flake8 errors
...
continuation line over-indented for hanging indent
2017-07-17 01:28:16 +02:00
Andras Tim
92e2cd9c68
Fixed E125 flake8 errors
...
continuation line with same indent as next logical line
2017-07-17 01:28:16 +02:00
Andras Tim
051d76a63f
Fixed E124 flake8 errors
...
closing bracket does not match visual indentation
2017-07-17 01:28:16 +02:00
Andras Tim
425665cf25
Fixed E122 flake8 errors
...
continuation line missing indentation or outdented
2017-07-17 01:28:16 +02:00
Andras Tim
0be97624b7
Fixed E121 flake8 errors
...
continuation line under-indented for hanging indent
2017-07-17 01:28:16 +02:00
Andras Tim
6146ac97d9
Fixed E101 flake8 errors
...
indentation contains mixed spaces and tabs
2017-07-17 01:28:16 +02:00
Andras Tim
6af2abdb53
Fixed flake8 warnings
...
W191 indentation contains tabs
W292 no newline at end of file
W293 blank line contains whitespace
W391 blank line at end of file
2017-07-17 01:28:16 +02:00
Llandy Riveron Del Risco
ba9a76fdb3
Provides encoding attribute on CaptureIO
...
Fix #2375
2017-07-16 14:29:00 +02:00
Martin Altmayer
e5169a026a
#2574 : --fixtures, --fixtures-per-test keep indentation of docstring
2017-07-15 13:33:11 +02:00
Alex Hartoto
97fdc9a7fe
Ensure final collected line doesn't include artifacts
...
We sometimes would see the following line:
collected 1 item s
just because previous write to the terminal includes number of
characters greater than 'collected 1 item'.
2017-07-13 12:11:20 -07:00
Ronny Pfannschmidt
771cedd3da
Merge pull request #2567 from nicoddemus/add-report-section-docs
...
Add docs for Item.add_report_section in the docs
2017-07-13 10:55:03 +02:00
Ronny Pfannschmidt
81cec9f5e3
Merge pull request #2563 from pv/yield-warn-spam
...
Make YIELD_TEST warning less spammy
2017-07-13 10:45:46 +02:00
Ronny Pfannschmidt
1485a3a902
Merge pull request #2566 from jmsdvl/iss2518
...
Detect and warn/ignore local python installations
2017-07-13 10:44:04 +02:00
John Still
67fca04050
update docs and note; add virtualenv collection tests
2017-07-11 23:14:38 -05:00
Bruno Oliveira
73b07e1439
Add docs for Item.add_report_section in the docs
...
Fix #2381
2017-07-11 21:45:27 -03:00
John Still
b32cfc88da
use presence of activate script rather than sys.prefix to determine if a dir is a virtualenv
2017-07-11 14:32:09 -05:00
John Still
676c4f970d
trim trailing ws
2017-07-11 13:31:11 -05:00
John Still
89c73582ca
ignore the active python installation unless told otherwise
2017-07-11 11:52:16 -05:00
Bruno Oliveira
d9aaab7ab2
Merge remote-tracking branch 'upstream/master' into features
2017-07-10 17:51:59 -03:00
Pauli Virtanen
8a7d98fed9
Make YIELD_TEST warning less spammy
...
Emit it only once per each generator, rather than for each generated
function. Also add information about which test caused it to be emitted.
2017-07-10 21:41:09 +02:00
John Still
80595115b0
replace all _escape_strings to _ascii_escaped
2017-07-10 12:32:27 -05:00
V.Kuznetsov
f471eef661
ini option cache_dir
2017-07-07 13:07:06 +03:00
Ronny Pfannschmidt
ef62b86335
Merge pull request #2492 from kalekundert/features
...
Add support for numpy arrays (and dicts) to approx.
2017-07-06 11:46:51 +02:00
Ronny Pfannschmidt
7cd03d7611
Merge pull request #2554 from nicoddemus/pytest-configure-order
...
Clarify pytest_configure hook call order
2017-07-05 14:22:55 +02:00
Bruno Oliveira
3667086acc
Clarify pytest_configure hook call order
...
Fix #2539
2017-07-05 07:50:59 -03:00
Bruno Oliveira
221f42c5ce
Change --strict help message to clarify it deals with unregistered markers
...
Fix #2444
2017-07-04 20:14:57 -03:00
Kale Kundert
7a1a439049
Use `cls` instead of `ApproxNumpyBase`.
...
Slightly more general, probably doesn't make a difference.
2017-07-04 09:20:52 -07:00
Bruno Oliveira
b62aef3372
Merge branch 'master' into features
2017-07-04 12:44:58 -03:00
Kale Kundert
c111e9dac3
Avoid making multiple ApproxNumpy types.
2017-07-03 22:45:24 -07:00
Kale Kundert
8524a57075
Add "approx" to all the repr-strings.
2017-07-03 22:44:37 -07:00
Bruno Oliveira
6908d93ba1
Merge pull request #2475 from ant31/master
...
[wip] Fix ignore_path condition
2017-07-03 18:57:17 -03:00
Nathaniel Waisbrot
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
Ronny Pfannschmidt
9b51fc646c
Merge pull request #2526 from nicoddemus/merge-master-into-features
...
Merge master into features
2017-06-24 11:25:35 +02:00
Antoine Legrand
16df4da1f7
Fix exclude_path check
2017-06-24 10:58:47 +02:00
Bruno Oliveira
3de93657bd
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-06-24 00:47:48 -03:00
Ronny Pfannschmidt
0d0b01bded
introduce deprecation warnings for legacy parametersets, fixes #2427
2017-06-23 22:06:49 +02:00
Ronny Pfannschmidt
8d5f2872d3
minor code style fix
2017-06-23 11:59:03 +02:00
Ronny Pfannschmidt
23d016f114
address review comments
...
* enhance api for fetching marks off an object
* rename functions for storing marks
* enhance deprecation message for MarkInfo
2017-06-23 11:05:38 +02:00
Bruno Oliveira
22b7701431
Merge pull request #2480 from nicoddemus/issue-2469-deprecated-call-ctx
...
deprecated_call context manager captures warnings already raised
2017-06-22 10:53:28 -03:00
Ronny Pfannschmidt
1d926011a4
add deprecation warnings for using markinfo attributes
2017-06-22 15:12:50 +02:00
Bruno Oliveira
ff8dbd0ad8
Add tracebackhide to function call form of deprecated_call
2017-06-22 08:54:39 -03:00
Ronny Pfannschmidt
5e832017d5
Merge pull request #2487 from nicoddemus/recursion-error-2486
...
Fix internal error when trying to detect the start of a recursive traceback
2017-06-22 13:40:32 +02:00
Ronny Pfannschmidt
19b12b22e7
store pristine marks on function.pytestmark
...
fixes #2516
2017-06-22 10:48:45 +02:00
Ronny Pfannschmidt
64ae6ae25d
extract application of marks and legacy markinfos
2017-06-22 10:41:28 +02:00
Ronny Pfannschmidt
bdec2c8f9e
move marker transfer to _pytest.mark
2017-06-22 08:45:10 +02:00
Kale Kundert
9597e674d9
Use sets to compare dictionary keys.
2017-06-16 08:25:13 -07:00
Kale Kundert
4d02863b16
Remove a dict-comprehension.
...
Not compatible with python26.
2017-06-15 18:56:09 -07:00
Kale Kundert
50769557e8
Skip the numpy doctests.
...
They seem like more trouble that they're worth.
2017-06-15 14:53:27 -07:00
Kale Kundert
8badb47db6
Implement suggestions from code review.
...
- Avoid importing numpy unless necessary.
- Mention numpy arrays and dictionaries in the docs.
- Add numpy to the list of tox dependencies.
- Don't unnecessarily copy arrays or allocate empty space for them.
- Use code from compat.py rather than writing py2/3 versions of things
myself.
- Avoid reimplementing __repr__ for built-in types.
- Add an option to consider NaN == NaN, because sometimes people use NaN
to mean "missing data".
2017-06-15 09:19:10 -07:00
Ronny Pfannschmidt
4e57a39067
Merge pull request #2468 from nicoddemus/collection-report-2464
...
Fix incorrect "collected items" report when specifying tests on the command-line
2017-06-14 10:57:57 +02:00
Ronny Pfannschmidt
af0344e940
Merge pull request #2500 from nicoddemus/issue-2434-doctest-modules
...
Fix decode error in Python 2 for doctests in docstrings
2017-06-14 05:52:44 +02:00
Bruno Oliveira
97367cf773
Remove obsolete comment from rewrite.py
...
This was made obsolete by 021e843427
2017-06-13 23:12:33 -03:00
Bruno Oliveira
336cf3e1f5
Merge pull request #2496 from rmfitzpatrick/pytest2440_handle_subrequest_finalizer_exceptions
...
Handle exceptions in subrequest finalizers
2017-06-13 23:03:03 -03:00
Bruno Oliveira
4e4ebbef5a
Improve test to ensure the expected function is re-raised
2017-06-13 20:16:48 -03:00
Bruno Oliveira
b09d60c60a
Fix decode error in Python 2 for doctests in docstrings
...
Fix #2434
2017-06-13 19:41:34 -03:00
Max Moroz
21137cf8c5
Add firstresult=True to the hook docs
2017-06-12 19:45:35 -07:00
Ryan Fitzpatrick
5a856b6e29
handle and reraise subrequest finalizer exceptions
2017-06-12 21:26:42 -04:00
Kale Kundert
8c22aee256
Resolve merge conflict due to approx being moved.
2017-06-11 19:46:59 -07:00
Kale Kundert
9f3122fec6
Add support for numpy arrays (and dicts) to approx.
...
This fixes #1994 . It turned out to require a lot of refactoring because
subclassing numpy.ndarray was necessary to coerce python into calling
the right `__eq__` operator.
2017-06-11 19:27:41 -07:00
Ronny Pfannschmidt
6be57a3711
move python api helpers out of the python module
...
this separates exposed normal api from collection elements
2017-06-11 12:27:16 +02:00
Ronny Pfannschmidt
36251e0db4
move approx to own file
2017-06-11 12:15:30 +02:00
Bruno Oliveira
8bb589fc5d
Fix internal error when trying to detect the start of a recursive traceback.
...
Fix #2486
2017-06-09 19:26:26 -03:00
Ronny Pfannschmidt
917b9a8352
Merge pull request #2476 from nicoddemus/fix-2459-numpy-comparison
...
Fix internal error when a recursion error occurs and frames contain objects that can't be compared
2017-06-07 20:34:36 +02:00
Bruno Oliveira
2127a2378a
Fix internal error with recursive tracebacks with that frames contain objects that can't be compared
...
Fix #2459
2017-06-07 14:40:13 -03:00
Ronny Pfannschmidt
d2db6626cf
Merge pull request #2466 from nicoddemus/remove-unicode-warning
...
Remove UnicodeWarning from pytest warnings
2017-06-07 08:00:36 +02:00
Bruno Oliveira
620ba5971f
deprecated_call context manager captures warnings already raised
...
Fix #2469
2017-06-06 22:40:04 -03:00
ApaDoctor
54a90e9555
docs: Create links for objects to show the api
2017-06-06 01:10:32 +02:00
Bruno Oliveira
9d41eaedbf
Issue UnicodeWarning only for non-ascii unicode
...
Fix #2463
2017-06-05 10:43:15 -03:00
Bruno Oliveira
46d157fe07
Fix collection report when collecting a single test item
2017-06-03 20:39:53 -03:00
Bruno Oliveira
87e4a28351
Fix incorrect collected items report when specifying tests on the command-line
...
Fix #2464
2017-06-03 20:39:53 -03:00
Segev Finer
59b3693988
Fixed wrong if in the WindowsConsoleIO workaround
2017-06-02 12:34:26 +03:00
Segev Finer
05796be21a
A workaround for Python 3.6 WindowsConsoleIO breaking with FDCapture
...
Python 3.6 implemented unicode console handling for Windows. This works
by reading/writing to the raw console handle using
``{Read,Write}ConsoleW``.
The problem is that we are going to ``dup2`` over the stdio file
descriptors when doing ``FDCapture`` and this will ``CloseHandle`` the
handles used by Python to write to the console. Though there is still some
weirdness and the console handle seems to only be closed randomly and not
on the first call to ``CloseHandle``, or maybe it gets reopened with the
same handle value when we suspend capturing.
The workaround in this case will reopen stdio with a different fd which
also means a different handle by replicating the logic in
"Py_lifecycle.c:initstdio/create_stdio".
See https://github.com/pytest-dev/py/issues/103
2017-06-02 11:19:03 +03:00
Segev Finer
9abff7f72f
Add a docstring to HelpAction
2017-06-01 22:25:09 +03:00
Segev Finer
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
Andreas Pelme
021e843427
Fixed #2121 Use `py.path`s fnmatch. This fixes an issue where
...
python_files handled properly when rewriting assertions.
2017-05-31 08:25:04 +02:00
Bruno Oliveira
1dee443c2b
Merge pull request #2445 from nicoddemus/warnings-remove-filter
...
No longer override existing warning filters during warnings capture
2017-05-30 18:14:01 -03:00
Bruno Oliveira
32e2642233
No longer override existing warning filters during warnings capture
...
Fix #2430
2017-05-30 17:17:36 -03:00
Bruno Oliveira
f96a1d89c5
pytest.deprecated_call now captures PendingDeprecationWarning in context manager form
...
Fix #2441
2017-05-30 12:52:18 -03:00
Bruno Oliveira
836dc451f4
Fix unicode issue while running doctests in Python 2
...
Fix #2434
2017-05-26 07:35:14 -03:00
wanghui
d7a5c5716f
Add UnicodeWarning for unicode warnings in Python2
2017-05-26 13:12:02 +08:00
wanghui
c39689da41
Correct warnings with unicode message.
2017-05-25 17:59:42 +08:00
Florian Bruhin
d9b93674c3
Make --cache-show output deterministic
...
This makes sure things don't jump around in the regenerated docs.
2017-05-23 08:01:39 +02:00
Bruno Oliveira
d343f9497c
Merge branch 'release-3.1'
2017-05-22 19:10:06 -03:00
Jason R. Coombs
c9c2c34b44
Remove unused parameter
2017-05-20 04:39:45 -04:00
Jason R. Coombs
9beeef970e
Parse the filename in the generator expression
2017-05-20 04:38:30 -04:00
Jason R. Coombs
43aa037ebd
Reindent
2017-05-20 04:38:30 -04:00
Jason R. Coombs
2abf2070f2
Collapse nested for loops into a generator expression
2017-05-20 04:38:30 -04:00
Jason R. Coombs
ce0ff0040f
Reindent and add docstring
2017-05-20 04:38:27 -04:00
Jason R. Coombs
6d2e11b7d1
Extract method for _mark_plugins_for_rewrite
2017-05-20 04:18:41 -04:00
Bruno Oliveira
d86c89e193
Revert refactor of old-style to new-style classes
...
As discussed in the mailing list, unfortunately this might break APIs
due to the subtle differences between new and old-style classes (see #2398 ).
This reverts commit d4afa1554b
from PR #2179 .
2017-05-17 18:20:51 -03:00
Ronny Pfannschmidt
783670b84e
Merge pull request #2274 from dmand/feat/junitxml/suite-name-option
...
Add `junit_suite_name` ini option
2017-05-13 19:10:29 +02:00
Dmitri Pribysh
c9282f9e94
Transition to using ini option for suite name
2017-05-12 17:48:50 -03:00
Dmitri Pribysh
fe7d89f033
Add '--junit-suite-name' CLI option
2017-05-12 17:48:50 -03:00
Ronny Pfannschmidt
8bcf88ec12
try to consider all modules after registration as plugin
2017-05-05 11:16:05 +02:00
Bruno Oliveira
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
Bruno Oliveira
630cca2fba
Fix py35-trial environment
...
After updating to twisted 17.1.0, again the trial tests started to fail; didn't investigate too deep, decided to just
no longer delete "zope" modules when cleaning up after pytester because it seems more zope modules keep
global state that shouldn't be discarded
2017-05-02 21:05:42 -03:00
Vitaly Lashmanov
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
Bruno Oliveira
cccb2cc92b
Merge pull request #1834 from RonnyPfannschmidt/setuptools-scm-take-2
...
second take at setuptools_scm
2017-04-27 09:10:23 -03:00
Ronny Pfannschmidt
a280e43949
fix import error
2017-04-26 15:57:55 +02:00
Ronny Pfannschmidt
e02cb6d7ce
restore setuptools_scm write_to usage
2017-04-23 16:59:08 +02:00
Bruno Oliveira
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
Ronny Pfannschmidt
4242bf6262
use unknown to specify unknown versions
2017-04-20 21:46:58 +02:00
Kodi Arfer
dcefb287fc
Try not to assume a module's file extension is .py
2017-04-19 12:26:56 -07:00
Ronny Pfannschmidt
2cf422733c
restore linting, drop _pytest._version for check-manifest
2017-04-19 20:25:53 +02:00
Ronny Pfannschmidt
c3aee4b1e6
second take at setuptools_scm
...
since setuptools 18.6 fixes the issues with develop installs
https://github.com/pypa/setuptools/blob/master/CHANGES.rst#186
https://github.com/pypa/setuptools/issues/439
2017-04-19 19:40:42 +02:00
Bruno Oliveira
cac82e71d8
Improve item.warn handling of fslocation parameter
...
Just pass fslocation forward and let the hook implementer decide what to do with the parameter
2017-04-13 19:01:14 -03:00
Bruno Oliveira
d9a2e70155
Change LsofFdLeakChecker to emit a warning instead of failing when detecting leaked FDs
...
Related to #2366
2017-04-13 17:34:48 -03:00
Michael Howitz
7d4ac14a31
Fix #2343 : Replace version checks by constants.
...
This way they do not have to be recomputed at runtime.
2017-04-12 08:18:09 +02:00
Bruno Oliveira
731776702d
Fix hook name in LsofFdLeakChecker
2017-04-11 21:55:12 -03:00
Bruno Oliveira
83c508eea3
Verify hooks after collection completes
...
Fix #1821
2017-04-11 21:55:12 -03:00
Bruno Oliveira
78ac1bf5d1
Merge pull request #2350 from nicoddemus/future-imports-rewrite
...
Ensure rewritten modules don't inherit __future__ flags from pytest
2017-04-11 20:59:05 -03:00
Jonas Obrist
0ab85e7a9c
Changed behavior if --lf and --ff are both used.
...
When using both --last-failed/--lf and --failed-first/--ff pytest would
run all tests with failed tests first (as if --lf was not provied). This
patch changes it so that when using both flags, only the last failed
tests are run. This makes it easier to set --ff as the default behavior
via the config file and then selectively use --lf to only run the last
failed tests.
2017-04-10 17:46:13 +09:00
Ben Lloyd
21f1c2b03f
Update fixtures.py
...
Corrected "or or" typo in docstring (and made indentation consistent).
2017-04-07 16:48:38 +01:00
Bruno Oliveira
1b5f898dc5
Ensure rewritten modules don't inherit __future__ flags from pytest
...
In a recent refactoring we enabled all __future__ features in pytest
modules, but that has the unwanted side effect of propagating those
features to compile()'d modules inside assertion rewriting, unless
we pass dont_inherit=False to compile().
2017-04-06 15:00:36 -03:00
reut
417b54abed
added option to unicode plugin name
2017-04-05 13:03:11 +00:00
Bruno Oliveira
a542ed48a2
Convert using utf-8 instead of ascii in safe_str()
...
This way we don't lose information and the returned string is
ascii-compatible anyway
2017-03-29 15:18:41 -03:00
Bruno Oliveira
58ac4faf0c
Fix exception formatting while importing test modules
...
Fix #2336
2017-03-29 14:43:13 -03:00
Ronny Pfannschmidt
afb1778294
put in a singular namespace hook to work around the strange issue
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
ebeba79be3
remove the namespace hook from mark after the param feature merge
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
6165939b0d
fix rebase mistakes
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
efe03400d8
fixup nose/pytest plugins
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
c9ab421398
fix python2 only import loop failure
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
147bb8aea5
correct setting pytest.config
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
7cdefce656
fix up oversights
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
92f6ab1881
fix all singular internal module imports and add a test for them
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
23bc9815c4
remove pytest_namespace from _pytest.fixtures
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
ae234786ea
remove pytest_namespace from _pytest.python
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
99c8f2d403
remove pytest_namespace from _pytest.main
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
61f418a267
hollow out pytest_namespace in _pytest.fixtures
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
9b58d6eaca
prepare a own pytest.collect fake module in oder to remove the nested builtin namespaces
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
839c936153
_pytest.mark: fix unconfigure after bad configure, still potential bug
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
7d797b7dbf
add a note about the deprecation of the pytest_namespace hook
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
9b755f6ec6
remove pytest_namespace from _pytest.skipping
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
90788defb2
remove pytest_namespace from _pytest.mark and fix latent pytest nesting bug
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
6a02cdbb35
remove pytest_namespace from _pytest/runner.py
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
c74103f395
remove pytest_namespace from recwarn and fixture decorators
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
794fd5658c
remove pytest_namespace from _pytest/debugging.py
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
fab9b993f8
remove pytest_namespace from _pytest.freeze_support
2017-03-28 11:45:06 +02:00
Ronny Pfannschmidt
5818e65cf3
remove pytest_namespace from _pytest/assertion
2017-03-28 11:35:29 +02:00
Bruno Oliveira
2c730743f1
Fix errors related to warnings raised by xdist
...
- pytester was creating a 'pexpect' directory to serve as temporary dir, but due to the fact that
xdist adds the current directory to sys.path, that directory was being considered as candidate
for import as a package. The directory is empty and a warning was being raised about
it missing __init__ file, which is now turned into an error by our filterwarnings config
in pytest.ini.
- Decided to play it safe and ignore any warnings during `pytest.importorskip`.
- pytest-xdist and execnet raise two warnings which should be fixed upstream:
pytest-dev/pytest-xdist/issues/133
2017-03-21 22:17:07 -03:00
Bruno Oliveira
fa56114115
Clean up warnings generated by pytest's own suite
2017-03-20 22:13:17 -03:00
Bruno Oliveira
d027f760c0
Avoid displaying the same warning multiple times for an item
2017-03-20 20:40:53 -03:00
Bruno Oliveira
3373e02eae
Add __future__ imports to warnings module
2017-03-20 20:06:01 -03:00
Bruno Oliveira
9f85584656
Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings
2017-03-20 19:59:05 -03:00
Ronny Pfannschmidt
e368fb4b29
implement pytest.param
...
this allows a clear addition of parameterization parameters that carry along marks
instead of nesting multiple mark objects and destroying the possibility of creating
function valued parameters,
it just folders everything together into one object carrfying parameters, and the marks.
2017-03-17 16:53:43 +01:00
Bruno Oliveira
e5021dc9dc
Replace py.builtin.print_() calls by builtin print() function
2017-03-16 22:46:51 -03:00
Bruno Oliveira
42a5d6bdfa
Add __future__ imports to all pytest modules
...
This prevents silly errors from creeping in Python 2 when testing in Python 3
2017-03-16 22:45:40 -03:00
Bruno Oliveira
78194093af
Improve warning representation in terminal plugin and fix tests
2017-03-16 21:57:32 -03:00
Bruno Oliveira
be5db6fa22
Capture warnings around the entire runtestprotocol
...
This is necessary for the warnings plugin to play nice with the
recwarn fixture
2017-03-16 21:54:41 -03:00
Bruno Oliveira
0baed781fe
Merge remote-tracking branch 'upstream/features' into integrate-pytest-warnings
2017-03-16 20:02:06 -03:00
Xander Johnson
dc6890709e
Change ValueError to io.UnsupportedOperation in capture.py. Resolves issue #2276
2017-03-14 18:55:58 -03:00
Bruno Oliveira
fa15ae7545
Post 3.0.7 release handling
2017-03-14 18:07:44 -03:00
Bruno Oliveira
b1ab2ca963
Bump to version 3.0.7 and update CHANGELOG
2017-03-13 18:37:49 -04:00
Bruno Oliveira
22864b75ee
Refactor recwarn to use warnings.catch_warnings instead of custom code
...
Since we dropped 2.5, we can now use warnings.catch_warnings to do the
"catch warnings" magic for us, simplifying the code a bit.
2017-03-13 19:28:36 -03:00
Bruno Oliveira
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
fbjorn
cee578e327
Fix trailing whitespace in terminal output
2017-03-05 23:20:55 +03:00
Bruno Oliveira
272afa9422
Display node ids and the warnings generated by it
...
The rationale of using node ids is that users can copy/paste it to run a chosen test
2017-03-04 20:53:42 -03:00
Bruno Oliveira
bddb922f7b
Rename internal option to disable_warnings
2017-03-04 16:32:10 -03:00
Bruno Oliveira
de09023e45
Also capture warnings during setup/teardown
2017-03-04 16:15:03 -03:00
Bruno Oliveira
e24081bf76
Change warning output
2017-03-04 15:59:20 -03:00
Omer Hadari
6a52fe1650
fixed internal error on unprintable raised AssertionErrors
2017-03-04 10:26:46 +02:00
Katerina Koukiou
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
Bruno Oliveira
3aac3d0a00
Merge branch 'master' into anydbmfix
2017-03-01 14:41:18 -03:00
Anthony Sottile
8b598f00e9
Make pytester use pytest's capture implementation
2017-02-23 17:46:28 -08:00
Anthony Sottile
6ba3475448
Make capsys more like stdio streams in python3. Resolves #1407 .
2017-02-23 17:46:27 -08:00
Katerina Koukiou
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
Bruno Oliveira
82785fcd40
Use warnings.catch_warnings instead of WarningsRecorder
...
This has the benefical side-effect of not calling the original
warnings.showwarnings function, which in its original form
only writes the formatted warning to sys.stdout.
Calling the original warnings.showwarnings has the effect that nested WarningsRecorder all catch the warnings:
with WarningsRecorder() as rec1:
with WarningsRecorder() as rec2:
warnings.warn(UserWarning, 'some warning')
(both rec1 and rec2 sees the warning)
When running tests with `testdir`, the main pytest session would then see the warnings created by
the internal code being tested (if any), and the main pytest session would end up with warnings as well.
2017-02-18 13:08:14 -02:00
Bruno Oliveira
a7643a5fbe
Merge branch 'features' into integrate-pytest-warnings
2017-02-18 11:03:15 -02:00
Bruno Oliveira
f1900bbea6
Revert subclassing explicitly from object introduced by accident in #2260
2017-02-18 10:34:41 -02:00
Victor Uriarte
a88017cf26
Add note documenting #2257
2017-02-16 23:00:55 -07:00
Victor Uriarte
58d7f4e048
Correct typo
2017-02-16 22:52:06 -07:00
Michal Wajszczuk
fb0b90646e
New-style classes implemented for python 2.7 - #2147
2017-02-16 20:28:17 +01:00
Bruno Oliveira
9c809f5ad0
Merge pull request #2255 from scop/spelling
...
Spelling fixes
2017-02-15 18:41:49 -02:00
Bruno Oliveira
27f12ed0c3
Merge pull request #2254 from scop/py36-escseq
...
Python 3.6 invalid escape sequence deprecation fixes
2017-02-15 18:41:06 -02:00
Ville Skyttä
ede4e9171f
Spelling fixes
2017-02-15 17:00:58 +02:00
Ville Skyttä
eeb6603d71
Python 3.6 invalid escape sequence deprecation fixes
2017-02-15 16:54:53 +02:00
Florian Bruhin
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
Patrick Hayes
58ce3a9e8c
Safer sys.modules delete
2017-02-14 16:54:32 -08:00
Bruno Oliveira
9eb1d73951
--override-ini now correctly overrides some fundamental options like "python_files"
...
#2238
2017-02-08 23:03:33 -02:00
Bruno Oliveira
6a097aa0f1
Merge branch 'master' into allow_skipping_unittests_with_pdb_active
2017-02-08 20:30:14 -02:00
Ran Benita
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
Ran Benita
87fb689ab1
Remove an unneeded `except KeyboardInterrupt`
...
KeyboardInterrupt is a subclass of BaseException, but not of Exception.
Hence if we remove this except, KeyboardInterrupts will still be raised
so the behavior stays the same.
2017-02-07 14:12:09 +02:00
Bruno Oliveira
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
Bruno Oliveira
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
Vidar Tonaas Fauske
bad261279c
Do not asssume `Item.obj` in 'skipping' plugin
...
See #2231 for discussion.
2017-02-03 16:04:34 +01:00
Thomas Kriechbaumer
43662ce789
allow error message matching in pytest.raises
2017-02-02 19:52:33 +01:00
mbyt
ad56cd8027
extract a _handle_skip method, secure PY2 branch
2017-02-02 05:01:51 +01:00
Bruno Oliveira
176c680e19
Merge branch 'master' into allow_skipping_unittests_with_pdb_active
2017-02-01 15:53:14 -02:00
Bruno Oliveira
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
mbyt
36b6f17727
fixing code-style, keep flake8 happy
2017-01-31 21:03:49 +01:00
mbyt
d1c725078a
Allow to skip unittests if --pdb active
...
closes #2137
2017-01-31 04:47:31 +01:00
Ronny Pfannschmidt
3b47cb45e6
Merge pull request #2222 from RonnyPfannschmidt/features
...
merge master into features
2017-01-26 13:48:10 +01:00
Ronny Pfannschmidt
713bdc1f9f
merge master into features
2017-01-26 12:00:52 +01:00
Ronny Pfannschmidt
c9f327dc87
bump version to next dev
2017-01-22 22:21:08 +01:00
Ronny Pfannschmidt
01eaf9db51
fix the xfail docstring typo at the actual docstring + regendoc
2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt
55f21bd2b9
bump version
2017-01-22 18:44:30 +01:00
Ravi Chandra
0e58c3fa80
updates for PR review #2198
2017-01-21 16:47:49 +13:00
Ravi Chandra
c848d0a771
Pass parameter name to `make_parametrize_id` hook function
2017-01-21 16:46:45 +13:00
Bruno Oliveira
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
Ronny Pfannschmidt
7b4afd8946
remove unused import
2017-01-20 12:09:49 +01:00
Bruno Oliveira
3766060893
Merge branch 'master' into trial-envs
2017-01-20 08:37:34 -02:00
Ronny Pfannschmidt
4082f4024a
comment out compatproperty deprecations
...
todo: reenable in the features branch
2017-01-20 11:25:48 +01:00
Ronny Pfannschmidt
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
Bruno Oliveira
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
Bruno Oliveira
c477f09177
Assert statements of the pytester plugin again benefit from assertion rewriting
...
Fix #1920
2017-01-19 21:33:51 -02:00
Bruno Oliveira
2574da8d32
Fix pytester internal plugin to work correctly with latest versions of zope.interface
...
Fix #1989
2017-01-19 20:53:35 -02:00
Ronny Pfannschmidt
250597d468
get_real_func: use saferepr when formatting the error message
2017-01-19 13:05:58 +01:00
Ronny Pfannschmidt
123289a88e
fixes #2208 by introducing a iteration limit
2017-01-19 11:38:15 +01:00
Bruno Oliveira
7cd7c283dd
Refactor plugin specs handling into an isolated function
2017-01-12 14:31:35 -02:00
Bruno Oliveira
043aadeaf2
Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite
...
Fix #2185
2017-01-11 17:15:16 -02:00
Eli Boyarski
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
mandeep
d4afa1554b
Refactored old style classes to new style classes
2017-01-08 22:52:42 -06:00
Jeff Widman
6d81c684cc
Switch monkeypatch fixture to yield syntax
2017-01-04 15:06:52 -08:00
Loïc Estève
9e9547a9e4
Simplify condition
2017-01-03 10:57:19 -02:00
Loïc Estève
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
Barney Gale
3d18c9c1c6
'xfail' markers without a condition no longer rely on the underlying `Item`
...
deriving from `PyobjMixin`
2017-01-02 22:01:04 +00:00
Rafael Bertoldi
a9193a1531
No longer silently ignore errors in parametrize callable ids
2017-01-02 17:26:17 -02:00
Bruno Oliveira
402fbe503a
Merge branch 'master' into merge-master-into-features
2016-12-27 23:31:26 -02:00
Bruno Oliveira
091148f843
Merge pull request #2136 from hroncok/i2132
...
Tests: Check for ModuleNotFoundError on Python 3.6+
2016-12-27 23:10:58 -02:00
Bruno Oliveira
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
Bruno Oliveira
515fb09995
Move module error compatibility code to _pytest.compat
2016-12-27 22:01:22 -02:00
Andreas Pelme
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
Loïc Estève
c5f0b751f4
Improve error message when pytest.warns fail
...
The error message contains the expected type of warnings and the
warnings that were captured. Add tests.
2016-12-20 13:45:39 +01:00
Dmitry Malinovsky
a63b34c685
Switch to item fspath
2016-12-20 10:44:09 +06:00