7656fc8320
Added printing of captured stdout and stderr before entering pdb
2018-02-12 23:17:51 +02:00
b6166dccb4
Fix mock patchings detection when both mock and unittest.mock are present
2018-02-12 20:29:37 +01:00
e5b527d0e3
Add Sphinx parameter docs for `match` and `message` args to `pytest.raises()`
2018-02-09 16:28:17 -08:00
063e2da967
Merge pull request #3176 from feuillemorte/1478_no_stdout_option
...
#1478 Added --no-stdout option
2018-02-09 18:36:36 -02:00
da5882c2d5
#1478 Add doc and remove print
2018-02-09 21:36:48 +03:00
d776e5610e
Fix issue where a new line was always written for the live log finish section
2018-02-09 11:17:01 +00:00
a4cbd03535
Fix linting
2018-02-08 13:22:32 -02:00
71367881ed
#1478 Added --show-capture=both option (fix comments)
2018-02-08 16:21:22 +03:00
ad7d63df97
Rename _stream_logs_enabled to _log_cli_enabled and remove _stream_logs
2018-02-08 09:48:51 -02:00
0b71255dda
Expose `log_cli` as a CLI parser option.
2018-02-08 09:42:53 +00:00
ce0a9aadec
Merge pull request #3127 from feuillemorte/1642-add-rootdir-option
...
#1642 add rootdir option
2018-02-07 18:18:59 -02:00
f72182977d
Merge pull request #3183 from cheezman34/master
...
Fix ordering of tests to minimize fixture creating
2018-02-07 18:15:41 -02:00
ed12cf3fb3
Merge pull request #3189 from s0undt3ch/feature/logstart-logfinish
...
Additionally handle logstart and logfinish hooks
2018-02-07 18:09:45 -02:00
1a650a9eb9
#1478 Added --show-capture option
2018-02-06 23:38:51 +03:00
67558e0e22
Additionally handle logstart and logfinish hooks
2018-02-06 15:45:36 +00:00
2d0c1e941e
Fix versionadded tag in caplog function
2018-02-05 20:22:21 -02:00
0d15a46863
Don't traceback on unkown sections.
2018-02-05 19:09:38 +00:00
7c80c81433
Merge pull request #3152 from brianmaissy/silently_fail_to_import_during_postmortem
...
If we fail to import doctest.UnexpectedException during postmortem, fail quietly
2018-02-05 10:04:00 +01:00
867344d0d7
move import to top
2018-02-04 00:03:17 +02:00
c0ef4a4d35
Add captured log msgs to junit xml file
...
For each test this adds the captured log msgs to a system-* tag in the junit
xml output file. The destination of the system-* tag is specified by
junit_logging ini option.
2018-02-03 09:39:29 +01:00
4458e65fe7
Fix ordering of tests to minimize fixture creating
2018-02-01 13:07:45 -08:00
3eb6cad222
#1642 Fix comments
2018-02-01 11:20:37 +03:00
9f1772e679
#1642 Resolve conflicts
2018-02-01 00:18:28 +03:00
741b571f3b
#1642 fix tests and config.py
2018-02-01 00:03:24 +03:00
949a620d3a
#1478 Added --no-stdout option
2018-01-31 22:36:28 +03:00
e12a588c39
Merge branch 'master' into typo_for_parametrize
2018-01-30 16:22:54 -06:00
547070e2d8
Switch `for_parameterize` to `for_parametrize`
2018-01-30 16:20:43 -06:00
ebab1b6c69
live-logging: Colorize levelname
2018-01-30 18:21:12 +01:00
49773b573f
Merge pull request #3132 from raphaelcastaneda/feature/add-record-xml-attribute
...
implement #3130 - add record_xml_attribute fixture
2018-01-29 15:42:55 -02:00
269eeec702
Replace deprecated option.getvalue by option.getoption in cacheprovider
2018-01-29 08:40:29 -02:00
0e1be01b7a
Merge pull request #3108 from cheezman34/features
...
Optimize reorder_items in fixtures.py
2018-01-27 23:21:09 -02:00
aff463a3c4
Merge remote-tracking branch 'upstream/master' into features
2018-01-27 12:28:43 -02:00
b3247c1d03
Merge pull request #3044 from RonnyPfannschmidt/parameterset-empty-enable-xfail
...
empty parameterset - enable opt to xfail
2018-01-27 12:23:49 -02:00
cd0b2ace67
Merge pull request #3150 from alanbato/pytest_cache
...
Change cache directory structure to include `pytest`
2018-01-27 10:08:56 -02:00
17a1ed5edf
use a constant to sort out repeated use of the EMPTY_PARAMETERSET_OPTION
2018-01-26 12:12:26 +01:00
a54cd4c2fd
correct testing and usage of the empty_parameter_set_mark config option
2018-01-26 12:05:52 +01:00
d550c33cd0
s/empty_parameterset/empty_parameter_set_mark
2018-01-26 11:56:24 +01:00
a58099022a
Merge pull request #3124 from nicoddemus/logging-3013
...
Changes in the logging plugin for 3.4
2018-01-26 08:52:43 -02:00
37b41de779
fix #2527 - introduce a option to pic the empty parameterset action
2018-01-26 11:10:00 +01:00
bf2c10c810
parameterset: refactor marking empty parametersets
2018-01-26 11:10:00 +01:00
2a1b1107c5
If we fail to import doctest.UnexpectedException during postmortem, fail quietly and continue
2018-01-25 22:28:27 +02:00
a24ca9872f
Change cache directory name to include `pytest`
2018-01-25 07:50:08 -06:00
503e00f7ff
#1642 Remove adding rootdir to sys path
2018-01-25 15:57:29 +03:00
b8be339632
Merge pull request #3148 from nicoddemus/deprecate-old-style-classes-2147
...
All classes now subclass object for better py3 compatibility
2018-01-25 10:41:28 -02:00
15cbd61159
Change caplog.get_handler(when) to caplog.get_records(when)
...
While updating the docs I noticed that caplog.get_handler() exposes
the underlying Handler object, which I think it is a bit too much
detail at this stage. Update to return the records directly instead.
2018-01-24 19:08:49 -02:00
af37778b0d
All classes now subclass object for better py3 compatibility
...
Fix #2147
2018-01-24 18:23:42 -02:00
3f5e9ea71e
Fix -o behavior to no longer swallow all remaining options
...
The current behavior was too error-prone because a "-o" option would
swallow all the following non-option parameters:
pytest -o foo=bar path/to/test.py
path/to/test.py would be captured by the -o option, and would fail
because "path/to/test.py" is not in the format "key=value".
2018-01-23 21:19:16 -02:00
2c7f94fdb9
Added basic fix and test
2018-01-23 21:18:10 -02:00
b4e8861aa5
Fix typos
2018-01-23 19:02:32 -02:00
113bfb6be8
Report 'call' phase as 'live log call'
...
As commented in review, this makes it consistent with the headers shown
by stdout/stderr capturing ("Captured log call")
2018-01-22 21:43:35 -02:00
3a9d0b26d5
Use pytest_runtest_logstart to signal the start of a new test
...
This also simplifies the code a bit because we don't need to keep
a set of ids anymore
2018-01-22 21:20:48 -02:00
a5e60b6a2d
implement #3130 - adding record_xml_attribute fixture
...
update incorrect expected attribute value in test_record_attribute
attr names must be strings
Update CHANGELOG formatting
update usage documentation
Fix versionadded for record_xml_attribute
Indent the xml schema properly inside the warning box in the docs
2018-01-22 15:14:53 -08:00
0df42b4426
Show a header for each testing phase during live logging
...
As suggested during review
2018-01-22 21:00:52 -02:00
0d96a5bf90
Merge pull request #3135 from brianmaissy/doc/clarify_pytest_fixture_setup_with_fixture_that_returns_None
...
Clarify a possible confusion when using pytest_fixture_setup with fixture functions that return None
2018-01-22 18:02:33 -02:00
8994603d46
Document hooks (defined with historic=True) which cannot be used with hookwrapper=True
2018-01-21 23:17:16 +02:00
196dcc37a8
Clarify a possible confusion when using pytest_fixture_setup with fixture functions that return None
2018-01-21 21:50:26 +02:00
83034bbd48
#1642 Fix rootdir option
2018-01-20 22:30:01 +03:00
29a7b5e064
Initialize log_cli_handler to None during LoggingPlugin init
...
Some of testdir's functionality bypasses pytest_runtestloop so this
attribute needs to be set early
2018-01-20 14:19:45 -02:00
9dbcac9af3
Suspend stdout/stderr capturing when emitting live logging messages
2018-01-20 12:02:55 -02:00
97a4967b03
Improve code formatting
2018-01-20 12:02:55 -02:00
8f6a5928f7
Add newline before log messages and enable -v output when log_cli is enabled
2018-01-20 12:02:55 -02:00
5d89a93977
Small improvements to tests suggested during review
2018-01-20 12:02:54 -02:00
8d735f3e1d
Live log option now writes to the terminal reporter
...
Ref: #3013
2018-01-20 12:01:42 -02:00
aca1b06747
Undo log level set by caplog.set_level at the end of the test
...
Otherwise this leaks the log level information to other tests
Ref: #3013
2018-01-20 12:01:42 -02:00
8dcd2718aa
No longer change the level of any logger unless requested explicitly
...
Ref: #3013
2018-01-20 12:01:42 -02:00
5ad1313b8a
log_cli must now be enabled explicitly
...
Ref: #3013
2018-01-20 12:00:46 -02:00
3b3d237f07
Merge pull request #3117 from boxed/access_logs_in_teardown
...
Access captures logs in teardown
2018-01-20 11:21:17 -02:00
7ea5a22657
Access captures logs in teardown
2018-01-19 12:42:35 +01:00
d784155fd2
#1642 Add rootdir option
2018-01-17 23:02:31 +03:00
e3406e0818
Show usage errors in red
2018-01-16 19:35:32 -02:00
8433e2ba04
#2953 fix comments: fix exception type
2018-01-16 23:35:57 +03:00
648d5d0c6b
#2953 fix comments: use keyword module
2018-01-16 22:55:24 +03:00
076fb56f85
show a simple and easy error when keyword expressions trigger a syntax error
2018-01-16 21:30:44 +03:00
abbdb60051
Move logic determining if progress should be displayed to a function
2018-01-12 07:04:43 -02:00
5939b336cd
Fix progress report when tests fail during teardown
...
Fix #3088
2018-01-11 20:42:05 -02:00
4a704bbb55
fix reorder_items_atscope ordering
2018-01-11 11:30:52 -08:00
ee6c9f50a2
optimize fixtures.reorder_items
2018-01-11 11:30:52 -08:00
2674f352e8
Merge pull request #3091 from nicoddemus/conftest-hooks
...
Document bootstrap and initialization hooks
2018-01-11 11:14:20 -02:00
b68b80aec9
Add new pytest_runtest_logfinish hook
...
Fix #3101
2018-01-09 22:17:39 -02:00
bd1d17e8de
Replace py.std with stdlib imports
2018-01-09 12:44:10 -08:00
93306f6a5e
Merge remote-tracking branch 'upstream/master' into features
2018-01-09 18:41:00 -02:00
b6b36bc167
Handle pluggy package or module for traceback filtering
...
Since 0.6.1 pluggy has been turned into a package
2018-01-08 21:29:15 -02:00
afb8a4e35d
Document bootstrap and initialization hooks
...
Fix #2616
2018-01-06 13:31:38 -02:00
f24c470403
Assume not skipped by mark if attribute missing
...
Fixes #3074 .
2018-01-03 18:47:18 -05:00
c70efaa0fb
Merge pull request #3047 from RonnyPfannschmidt/mark-newapi
...
move node base classes from main to nodes
2017-12-19 07:59:25 -02:00
ed293ec3e9
pytester: no ignore files used to obtain current user metadata in the fd leak detector
2017-12-18 17:52:55 +01:00
94608c6110
port _Compatproperty to attrs
2017-12-18 11:08:20 +01:00
afc607cfd8
move node base classes from main to nodes
2017-12-18 11:08:20 +01:00
dfc5399cd7
Revert "WIP #3013"
...
This reverts commit 28a93b9eeb
2017-12-17 21:50:17 +01:00
76489d30f7
Revert "WIP"
...
This reverts commit d6f75d2836
2017-12-17 21:49:57 +01:00
d6f75d2836
WIP
2017-12-17 20:11:24 +01:00
f3c9c6e8a8
fix restoring Python state after in-process pytest runs
...
Now each in-process pytest run saves a snapshot of important global Python
state and restores it after the test completes, including the list of loaded
modules & the Python path settings.
Previously only the loaded package data was getting restored, but that was
also reverting any loaded package changes done in the test triggering the
pytest runs, and not only those done by the pytest runs themselves.
Updated acceptance tests broken by this change, which were only passing before
by accident as they were making multiple pytest runs with later ones depending
on sys.path changes left behind by the initial one.
2017-12-17 12:47:50 +01:00
67bd60d5c6
clean up Testdir taking snapshots & restoring global Python state
...
Now extracted to new CwdSnapshot, SysModulesSnapshot & SysPathsSnapshot
classes, each saving the state they are interested in on instantiation
and restoring it in its `restore()` method.
2017-12-17 12:47:50 +01:00
28a93b9eeb
WIP #3013
2017-12-17 06:54:57 +01:00
d87279115d
Merge pull request #3041 from segevfiner/capture-no-disable-progress
...
Use classic console output when -s is used
2017-12-16 12:34:34 -02:00
370daf0441
Use classic console output when -s is used
...
Fixes #3038
2017-12-16 15:00:23 +02:00
db4df5833a
Merge pull request #3030 from nicoddemus/leak
...
Fix memory leak caused by fixture values never been garbage collected
2017-12-14 19:20:34 -02:00
c3f63ac143
Fix memory leak caused by fixture values never been garbage collected
...
The leak was caused by the (unused) `FixtureRequest._fixture_values`
cache.
This was introduced because the `partial` object (created to call
FixtureDef.finish() bound with the Request) is kept alive
through the entire session when a function-scoped fixture depends
on a session-scoped (or higher) fixture because of the nested
`addfinalizer` calls.
FixtureDef.finish() started receiving a request object in order to
obtain the proper hook proxy object (#2127 ), but this does not seem
useful at all in practice because `pytest_fixture_post_finalizer`
will be called with the `request` object of the moment the fixture value
was *created*, not the request object active when the fixture value
is being destroyed. We should probably deprecate/remove the request
parameter from `pytest_fixture_post_finalizer`.
Fix #2981
2017-12-13 19:49:06 -02:00
3862b0b28d
Remove logger parameter from catching_logs
...
The logger parameter of catching_logs is not used anywhere. The main
motivation for removing the logger parameter is that it removes the
logger = logger or logging.getLogger(logger)
line. IMO there are too many occurences of the string 'logg' ;)
2017-12-13 21:13:59 +01:00
476d4df1b7
Merge pull request #3010 from cryvate/fix-issue-2985
...
Improve handling of pyargs
2017-12-13 13:56:42 +01:00
52449903c3
Merge pull request #3023 from nicoddemus/preparse-deprecated
...
Add param annotations and types to hookspec
2017-12-13 13:51:20 +01:00
506c9c91c0
Merge pull request #3025 from anntzer/dont-rewrite-plugin
...
Respect PYTEST_DONT_REWRITE for plugins too.
closes #2995
2017-12-13 12:34:51 +01:00
38f34e2fa1
Merge pull request #3012 from thisch/merge_contextmanagers
...
Integrate logging_using_handler into catching_logs
2017-12-13 06:59:48 -02:00
45e7734b1a
Change set ops to use methods instead of operators.
2017-12-13 00:54:57 -08:00
c8e7d1ae34
Respect PYTEST_DONT_REWRITE for plugins too.
2017-12-12 17:43:17 -08:00
7b5d4d01ed
Add param annotations and types to hookspec
...
Also mention which hook to use instead of the deprecated
pytest_cmdline_preparse
Fix #3022
2017-12-12 18:01:31 -02:00
1e295535c3
Move _patched_find_module to module namespace.
2017-12-12 09:53:06 +00:00
3ca1e4b7f0
Make patch for issue in pkgutil.ImpImporter local by using contextmanager.
2017-12-12 08:43:01 +00:00
f8f1a52ea0
Merge remote-tracking branch 'upstream/master' into features
2017-12-11 22:18:50 -02:00
5c6d7739bc
Merge pull request #3015 from jurko-gospodnetic/code-cleanup
...
Code cleanup
2017-12-11 22:15:50 -02:00
fc544dc660
remove redundant checking because
...
* isinstance([], Sequence) is True
* isinstance((), Sequence) is True
2017-12-12 00:10:59 +05:30
7792587b3f
remove unnecessary import
2017-12-12 00:03:38 +05:30
cb0ba18f53
remove '_ast' module; and redirect '_ast' references to 'ast'
2017-12-11 23:14:17 +05:30
596937e610
remove extra whitespace
2017-12-09 13:34:55 +01:00
57fcd3f57e
remove corpse code comments
2017-12-09 13:34:55 +01:00
65f5383106
fix comment & docstring typos, line wrapping & wording
2017-12-09 13:34:54 +01:00
ba209b5230
Integrate logging_using_handler into catching_logs
...
logging_using_handler is only used in catching_logs. Therefore it makes
sense to remove one of the many context managers from the logging
plugin.
2017-12-07 16:34:53 +01:00
b62fd79c0c
Fix issue 2985.
2017-12-07 15:12:44 +00:00
655146e522
Merge remote-tracking branch 'upstream/master' into features
2017-12-05 22:30:35 -02:00
ce30896cd2
Also blacklist pytest-capturelog plugin
...
This is the older plugin before pytest-catchlog was around. Apparently there are
people still using it.
Fixes #3004
2017-12-05 20:02:56 +01:00
2e8b0a83fe
Merge pull request #2989 from nicoddemus/bring-tr-writer-back-2984
...
Bring back TerminalReporter.writer as an alias to TerminalReporter._tw
2017-12-01 17:42:31 +01:00
369c711f14
Merge pull request #2971 from blueyed/fix-ZeroDivisionError
...
Fix ZeroDivisionError with 0 collected tests
2017-11-30 21:12:46 -02:00
cf0cac3b73
Bring back TerminalReporter.writer as an alias to TerminalReporter._tw
...
Fix #2984
2017-11-30 19:56:47 -02:00
70f1e3b4b0
Improve getscopeitem assertion message
...
Fix #2979
2017-11-30 07:53:43 -02:00
912330a7e2
Extend _pytest.python._idval to return __name__ of functions as well, not just for classes
2017-11-29 16:17:49 +00:00
88ed1ab648
Merge pull request #2964 from rpuntaie/master
...
fix issue #2920
2017-11-29 10:32:28 +01:00
191e8c6d9b
Merge pull request #2969 from nicoddemus/null-bytes-2957
...
Always escape null bytes when setting PYTEST_CURRENT_TEST
2017-11-29 06:57:48 +01:00
0f5fb7ed05
Fix ZeroDivisionError with 0 collected tests
...
This can easily happen with pytest-testmon.
2017-11-29 00:54:14 +01:00
89cf943e04
Always escape null bytes when setting PYTEST_CURRENT_TEST
...
Fix #2957
2017-11-28 19:45:13 -02:00
4ea7bbc197
fix issue #2920
2017-11-28 16:47:12 +01:00
796db80ca4
Only escape str-like arguments passed to warnings
...
Fix #2956
2017-11-27 23:17:15 -02:00
4678cbeb91
Merge remote-tracking branch 'upstream/features'
2017-11-27 19:37:58 -02:00
c58715371c
Merge pull request #2954 from blueyed/rewritten
...
Fix spelling: s/re-writ/rewrit/g
2017-11-26 18:12:30 -02:00
d5f038e29a
Fix spelling: s/re-writ/rewrit/g
...
This also fixes "can not" to "cannot" in the "Module already imported so
cannot be rewritten" assertion error.
2017-11-26 20:46:06 +01:00
95de11a44e
Block pytest-catchlog and issue a warning
...
Trying to install pytest-3.3 and pytest-catchlog will result in an
option conflicts because both declare the same options.
2017-11-23 19:53:12 -02:00
05cfdcc8cb
Revert making TerminalWriter public in TerminalReporter plugin
...
We eventually want to replace py.io.TerminalWriter (exposed as
"_tw" in TerminalReporter) by something else, so deprecating access
to "_tw" and making it public as "writer" is contrary to that.
2017-11-23 19:53:12 -02:00
f50ace7c0a
Merge remote-tracking branch 'upstream/master' into release-3.3.0
2017-11-23 20:20:40 +00:00
1d26f3730f
Fix docstrings in pytester
2017-11-22 17:15:59 -02:00
5e71ffab87
Handle marks without description
2017-11-22 15:47:15 +03:00
f05333ab75
Fix rewrite to not write past the edge of the screen
2017-11-22 00:00:02 -02:00
c8d52b633b
Fix assertion rewrite to match module names correctly
...
Fix #2939
2017-11-21 23:06:47 -02:00
3a5dbabf60
Add tests for progress output and docs for ``console_output_style``
...
Fix #2657
2017-11-21 21:01:51 -02:00
3441084bd2
Add progress output for verbose mode with xdist
2017-11-21 21:01:51 -02:00
8b92527d7d
Add re_match_lines and re_match_lines_random to pytester fixture
2017-11-21 21:01:51 -02:00
dab889304e
Implement progress percentage reporting while running tests
...
Fix #2657
2017-11-21 21:01:41 -02:00
219b758949
Add capsysbinary fixture
...
`capsysbinary` works like `capsys` but produces bytes for `readouterr()`.
2017-11-17 09:02:46 -08:00
6161bcff6e
Merge pull request #2925 from asottile/capfdbinary
...
Add capfdbinary fixture
2017-11-17 08:00:10 -02:00
1f08d990d5
Deprecate metafunc.addcall
...
Fix #2876
2017-11-15 15:16:00 -02:00
8f90812481
Add capfdbinary fixture
...
`capfdbinary` works like `capfd` but produces bytes for `readouterr()`.
2017-11-14 14:50:00 -08:00
a6f2d2d2c9
Rename FixtureDef.finalizer to FixtureDef.finalizers
2017-11-12 11:35:46 -02:00
6d3fe0b826
Explicitly clear finalizers list in finalize to ensure cleanup
2017-11-12 11:28:57 -02:00
bdad345f99
Fix passing request to finish() in FixtureDef
2017-11-12 11:28:26 -02:00
f074fd9ac6
Merge remote-tracking branch 'upstream/features' into malinoff/fix-2124
2017-11-12 11:16:08 -02:00
6550b9911b
pytest_fixture_post_finalizer now receives a request argument
2017-11-12 11:14:55 -02:00
258031afe5
Merge remote-tracking branch 'upstream/master' into malinoff/fix-2124
2017-11-12 10:34:47 -02:00
f0f2d2b861
Merge branch 'master' into fix-missing-nodeid-with-pyargs
2017-11-11 14:33:55 +01:00
d1af369800
Merge pull request #2913 from nicoddemus/merge-master-into-features
...
Merge master into features
2017-11-11 10:09:49 +01:00
b671c5a8bf
Merge pull request #2914 from nicoddemus/addfinalizer-refactor
...
Make SubRequest.addfinalizer an explicit method
2017-11-11 09:26:24 +01:00
f320686fe0
Make SubRequest.addfinalizer an explicit method
...
This implicit definition really tripped me while debugging #2127 ,
unfortunately hidden as it was in the middle of all the variable
declarations.
I think the explicit definition is much easier for the eyes and IDEs
to find.
2017-11-11 03:07:34 -02:00
742f9cb825
Merge pull request #2911 from RonnyPfannschmidt/remove-nodeinfo
...
remove unused _pytest.runner.NodeInfo class
2017-11-10 18:57:14 -02:00
983a09a2d4
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-11-10 18:33:02 -02:00
76f3be452a
remove unused _pytest.runner.NodeInfo class
2017-11-10 17:48:52 +01:00
c47dcaa713
switch a special case in scope node lookup to a general one
2017-11-10 17:35:42 +01:00
b11640c1eb
Fix linting E722: do not use bare except
2017-11-04 13:59:10 -02:00
03829fde8a
Fix linting E741: ambiguous variable name
2017-11-04 13:59:10 -02:00
e351976ef4
Merge remote-tracking branch 'upstream/features' into RonnyPfannschmidt/introduce-attrs
2017-11-04 12:32:27 -02:00
b18a9deb4c
Merge pull request #2892 from nicoddemus/merge-master-into-features
...
Merge upstream/master into features
2017-11-04 08:15:28 +01:00
d7e8eeef56
Merge pull request #2878 from RonnyPfannschmidt/collector-makeitem-deprecate
...
deprecate the public internal PyCollector.makeitem method
2017-11-03 17:13:18 -02:00
7d43225c36
Merge pull request #2877 from RonnyPfannschmidt/extract-extract-parameterset
...
move responsibility for parameterset extraction into parameterset class
2017-11-03 16:52:28 -02:00
f3a119c06a
Merge upstream/master into features
2017-11-03 16:37:18 -02:00
07b2b18a01
introduce attrs as dependency and use it
...
for FixtureFunctionMarker and marks
2017-10-30 17:04:42 +01:00
766de67392
Fix linting error in deprecated.py
2017-10-30 16:35:34 +01:00
821f9a94d8
deprecate the public internal PyCollector.makeitem method
2017-10-30 16:35:23 +01:00
2f993af54a
Fix context output handling for doctests
...
Show full context of doctest source in the pytest output, if the lineno of
failed example in the docstring is < 9.
2017-10-29 20:06:10 +00:00
b27dde24d6
Use a nametuple for `readouterr()` results
...
This allows accessing `out` and `err` directly by attribute,
while preserving tuple unpacking.
Also added tests, one for the `capsys` fixture, and one for the
`MultiCapture` class itself.
2017-10-28 14:53:19 -04:00
4a436f2255
move responsibility for parameterset extraction into parameterset class
2017-10-27 17:55:07 +02:00
fd7bfa30d0
Put imports on the last line unless there are other exprs
2017-10-25 11:05:07 +03:00
3427d27d5a
Try to get docstring from module node
2017-10-25 10:54:43 +03:00
def471b975
Merge pull request #2869 from nicoddemus/merge-master-into-features
...
Merge master into features
2017-10-25 09:08:08 +02:00
f743e95cfc
Merge pull request #2791 from OfirOshir/features
...
bugfix for issue #2491
2017-10-25 09:04:01 +02:00
4e581b637f
Use zip and map from six
2017-10-24 22:13:32 -02:00
6b86b0dbfe
Fix additional linting issues
2017-10-24 21:01:00 -02:00
bdab29fa3d
Merge pull request #2867 from Perlence/ini-markers-whitespace
...
Strip whitespace from markers in INI config
2017-10-24 20:11:20 -02:00
6821d36ca5
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-10-24 19:57:14 -02:00
52aadcd7c1
Strip whitespace from markers in INI config
...
Resolves #2856 .
2017-10-24 14:18:39 +03:00
f5e72d2f5f
Unused import / lint
2017-10-24 11:25:42 +01:00
a5ac19cc5e
Merge branch 'issue-2836-fixture-collection-bug' of github.com:tom-dalton-fanduel/pytest into issue-2836-fixture-collection-bug
2017-10-24 10:45:06 +01:00
14e3a5fcb9
Move the generic separator to a constant
2017-10-24 10:42:16 +01:00
a3ec3df0c8
Add E722 and E741 flake errors to the ignore list
...
Also fixed 'E704 multiple statements on one line (def)' in python_api
2017-10-23 18:19:15 -02:00
655ab0bf8b
Address more review comments, fix massive bug I reintroduced in the node-splitting code :-/
2017-10-23 17:49:49 +01:00
a7199fa8ab
Docstring typo
2017-10-23 16:59:56 +01:00
d714c196a5
Shorter code, longer docstring
2017-10-23 16:55:35 +01:00
ee7e1c94d2
Remove redundant if, tidy if-body
2017-10-23 16:12:07 +01:00
1e6dc6f8e5
Working (I think) fix for #2836
2017-10-23 13:26:42 +01:00
083084fcbc
Merge pull request #2842 from ceridwen/features
...
Use funcsigs and inspect.signature to do function argument analysis
2017-10-20 07:49:08 +02:00
3da28067f3
Replace introspection in compat.getfuncargnames() with inspect/funcsigs.signature
2017-10-19 16:01:26 -07:00
3f9f4be070
Merge pull request #2845 from jespino/fix/2832
...
Adding Failed exception to manage maxfail behavior
2017-10-19 09:12:11 +02:00
537fc3c315
Merge pull request #2824 from dirk-thomas/pytest_addopts_before_initini
...
get PYTEST_ADDOPTS before calling _initini
2017-10-18 18:35:12 -02:00
11b391ff49
Update mark.py
2017-10-17 14:11:07 -07:00
00d3abe6dc
Adding Failed exception to manage maxfail behavior
2017-10-17 21:32:20 +02:00
Brian Maissy
Marcin Bachry
Andy Freeland
Bruno Oliveira
feuillemorte
Pedro Algarvio
Ronny Pfannschmidt
Thomas Hisch
Aaron
Alan Velasco
Andrew Toolan
Raphael Castaneda
Anders Hovmöller
Anthony Sottile
Ian Lesperance
Jurko Gospodnetić
Segev Finer
Antony Lee
Henk-Jaap Wagenaar
Srinivas Reddy Thatiparthy
Florian Bruhin
ST John
Florian Bruhin
Daniel Hahler
Roland Puntaier
Sviatoslav Abakumov
Samuel Dion-Girardeau
Tom Dalton
Ceridwen
Matty G
Jesús Espino