p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,804 Commits 5 Branches 0 Tags 36 MiB
Commit Graph

504 Commits

Author SHA1 Message Date
earonesty 615474329d Update AUTHORS 2020-03-03 09:59:38 -03:00
kpinc eeebcd77dd
doc: add list of fixtures to start of fixture chapter (#6696) 
- Add list of fixtures to start of fixture chapter
- Add "fixture" cross ref type
 2020-02-22 14:56:19 +01:00
Nathaniel Compton 7c09d88b72
#6289: Add new example to XFAIL documentation (#6685) 
Fix #6289

Co-authored-by: Ran Benita <ran234@gmail.com>
 2020-02-19 15:04:37 -03:00
Bruno Oliveira e6ea9edffe
Merge pull request #6673 from sscherfke/features 
Reverse / fix meaning of "+/-" in error diffs
 2020-02-12 15:05:38 -03:00
Stefan Scherfke d59adc61f9 Reverse / fix meaning of "+/-" in error diffs 
The convention is "assert result is expected".  Pytest's error diffs now
reflect this. "-" means that sth. expected is missing in the result and
"+" means that there are unexpected extras in the result.

Fixes: #3333
 2020-02-10 21:12:37 +01:00
Vladyslav Rachek 9e262038c8
[parametrize] enforce explicit argnames declaration (#6330) 
Every argname used in `parametrize` either must
be declared explicitly in the python test function, or via
`indirect` list

Fix #5712
 2020-02-06 20:20:25 -03:00
Daniel Hahler 55e5817570 Merge master into features 2020-01-29 03:07:35 +01:00
Holger Kohr 80d4dd6f0b Replace `==` with `is` for comparison of cache keys 
Closes #6497
 2020-01-28 18:05:53 -03:00
Daniel Hahler c51173d426 Merge master into features 2020-01-25 14:18:02 +01:00
Tomáš Gavenčiak 5e15c86cc6 Fix EncodedFile.write return value 
Make EncodedFile, used for captured output streams, method .write return
the number of characters written. Add test for captured stderr write.
Fixes #6557.

Co-Authored-By: Bruno Oliveira <nicoddemus@gmail.com>
 2020-01-25 10:36:23 +01:00
Bruno Oliveira 93b74d28d2 Merge remote-tracking branch 'upstream/master' into mm 
Conflicts:
 * 	src/_pytest/_code/code.py
 * 	src/_pytest/main.py
 * 	testing/python/metafunc.py
 * 	testing/test_parseopt.py
 * 	testing/test_pytester.py
 2020-01-22 11:03:45 -03:00
Bruno Oliveira cc7f294cfe Revert "fixtures register finalizers with all fixtures before them in the stack" 
This reverts commit 99180939fe.
 2020-01-17 12:55:57 -03:00
Daniel Hahler 1667cf3350
Merge pull request #6384 from pv/showlocals-short 
Make --showlocals work together with --tb=short

Fixes https://github.com/pytest-dev/pytest/issues/494
Ref: https://github.com/pytest-dev/pytest/issues/1715
 2020-01-16 22:04:14 +01:00
Daniel Hahler 83813bf515 Merge master into features 
Conflicts:
	.github/workflows/main.yml
 2020-01-16 19:45:52 +01:00
Jakub Mitoraj ab6406b42e Update junit_logging with no,log,system-out,system-err,out-err,all 2020-01-16 08:14:46 +01:00
Chris NeJame 99180939fe fixtures register finalizers with all fixtures before them in the stack 2020-01-15 11:00:42 -05:00
Pauli Virtanen fd1691a2b3 Make --showlocals work together with --tb=short 
Enable showing local variables when asked to do so in the short
traceback mode.

Fixes #494
 2020-01-14 21:30:58 +02:00
Daniel Hahler 1356d20e90 Merge master into features 2020-01-10 05:20:41 +01:00
Seth Junot d4879c7afb Optimized renaming of test parameter ids 
While using pytest-repeat, I noticed the previous implementation is slow
for a large number of duplicate test ids. To optimize, this commit
reduces the amount of data copied and avoids using `in` with List
(unhashable type, and therefore is very slow for many elements).
 2019-12-16 18:53:48 -03:00
Bruno Oliveira 853889e5db Merge remote-tracking branch 'upstream/master' into mm 2019-12-14 10:45:44 -03:00
Bruno Oliveira cbb2f9541b
Merge pull request #6316 from cb109/make-keyword-expression-matching-case-insensitive 
Make keyword expression matching case-insensitive
 2019-12-12 06:47:59 -03:00
cmachalo e13ad22364 Include new --capture-mode=tee-sys option 
Fix #4597
 2019-12-09 13:05:23 -03:00
Christoph Buelter 24d4882d82 Update authors file and sort the list 2019-12-05 14:20:07 +01:00
Claudio Madotto 91b3ff1bb7 Create changelog file and update AUTHORS 2019-11-25 12:59:03 +01:00
Philipp Loose a02310a140 Add stacklevel tests for warnings, 'location' to pytest_warning_captured 
Resolves #4445 and #5928 (thanks to allanlewis)

Add CHANGELOG for location parameter
 2019-11-22 17:50:00 -03:00
Mark Dickinson 8d686a8e46 Add self to AUTHORS 2019-11-21 13:14:19 +00:00
Bruno Oliveira 21622d0df4 Merge remote-tracking branch 'upstream/master' into release-5.3.0 2019-11-19 12:42:11 -03:00
Anthony Sottile eeeb19626b
Merge pull request #6202 from linw1995/fix_getmodpath 
Fix incorrect result of getmodpath method.
 2019-11-18 15:14:52 -08:00
Josh Karpel 46ffdf0e3a
Update AUTHORS 2019-11-17 17:17:47 -06:00
JoshKarpel 6dfd683a0c changelog entry for #2049 2019-11-17 16:47:09 -06:00
林玮 329f56ecec Fix incorrect result of getmodpath method. 2019-11-16 15:28:04 +08:00
Anthony Sottile cc78444c30 Merge remote-tracking branch 'origin/master' into mm 2019-11-15 15:26:57 -08:00
Gregory Lee cc6c5e15b8 update AUTHORS list 2019-11-08 01:39:29 -05:00
Daniel Hahler e7320c6b54
Merge pull request #5926 from AtakamaLLC/optional-multiline 
Add log-auto-indent option to control multiline formatting
 2019-11-06 00:35:24 +01:00
MarcoGorelli d863c30c74 Fix plurality mismatch for and in pytest terminal summary 2019-10-27 15:16:24 +00:00
Michael Krebs 1f5b454355 Add log-auto-indent option to control multiline formatting 2019-10-25 11:31:33 -04:00
Daniil Galiev 9275012ef7 fix bug with nonskipped first test in package 2019-10-21 00:11:24 +02:00
Yoav Caspi e05b33ed16 setuponly: remove printing out/err from capman 2019-10-19 22:33:19 +03:00
Daniel Hahler 450409d123 Merge master into features 
Conflicts:
	src/_pytest/reports.py
        (via 7259c453d, moved the type annotation; setting it to `None`
        was removed in 3c82b1cb9 already)
 2019-09-17 12:46:36 +02:00
Gene Wood ca3884d9bb
Add Gene Wood to authors 2019-09-04 09:21:10 -07:00
Bruno Oliveira bd57307a39
Merge pull request #5768 from robholt/fixture-class-instance 
Fix self reference in function scoped fixtures
 2019-08-30 12:31:16 -03:00
Bruno Oliveira 955dc6d18a Merge remote-tracking branch 'upstream/master' into robholt/fixture-class-instance 2019-08-30 11:21:33 -03:00
Andrzej Klajnert 487659d8b1 Fix the scope behavior with indirect fixtures. 2019-08-29 07:23:08 +02:00
Christian Neumüller a98270eac0 Document the bugfix. 2019-08-27 16:36:40 +02:00
Michael Goerz d47b9d04d4 Gracefully handle HTTP errors from pastebin 
We find that the --pastebin option to pytest sometimes fails with "HTTP
Error 400: Bad Request". We're still investigating the exact cause of
these errors, but in the meantime, a failure to upload to the pastebin
service should probably not crash pytest and cause a test failure in the
continuous-integration.

This patch catches exceptions like HTTPError that may be thrown while
trying to communicate with the pastebin service, and reports them as a
"bad response", without crashing with a backtrace or failing the entire
test suite.
 2019-08-26 23:50:46 -04:00
Robert Holt 62381125e7
Fix self reference in function scoped fixtures 2019-08-19 15:57:39 -04:00
Daniel Hahler b5b710b3ae Merge master into features 
Several conflicts, mostly due to 2c402f4bd.

Conflicts:
	.pre-commit-config.yaml
	src/_pytest/outcomes.py
	src/_pytest/python_api.py
	tox.ini
 2019-08-02 16:52:51 +02:00
helloocc 1d8f668e10 Add author. 2019-07-24 23:44:37 +08:00
Tim Hoffmann da5add1294 Improve CSS layout 2019-07-14 18:58:07 +02:00
Bruno Oliveira 666acc9b7a
doctest: Add +NUMBER option to ignore irrelevant floating-point… (#5576) 
doctest: Add +NUMBER option to ignore irrelevant floating-point differences
 2019-07-11 07:25:37 -03:00
David Röthlisberger d5cc0f2a62 changelog for new NUMBERS doctest option 2019-07-08 17:16:35 +01:00
AmirElkess e32c903fb6
Update AUTHORS 2019-06-30 18:32:07 +02:00
Kevin J. Foley 95714436a1 Pickup additional positional args passed to _parse_parametrize_args 2019-06-24 20:43:52 -04:00
Ralph Giles 918268774b
Add `slow` marker in run/skip option example. 
The example implementation of a `--runslow` option results in
a `PytestUnknownMarkWarning`. Include registering the custom
mark in the example, based on the documentation in markers.rst.
 2019-06-06 10:15:43 -07:00
Akiomi Kamakura a304dbb519 Fix `disable_test_id_escaping_and_forfeit_all_rights_to_community_support` option when using a list of test IDs 2019-05-21 09:48:22 +09:00
Evan Kepner 6ca3e1e425
add @EvanKepner to authors 2019-05-12 10:04:24 -04:00
Pulkit Goyal 7e08e09473 logging: improve default logging format (issue5214) 
We improve the following things in the logging format:

  * Show module name instead of just the filename
  * show level of logging as the first thing
  * show lineno attached to module:file details

Thanks to @blueyed who suggested this on the github issue.

It's my first contribution and I have added myself to AUTHORS.

I also added to a changelog file.
 2019-05-08 21:37:59 +03:00
Bruno Oliveira 9f66102869 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-05-04 10:47:57 -03:00
DamianSkrzypczak 299e6479c1 add DamianSkrzypczak to AUTHORS 2019-05-02 23:45:34 +02:00
Daniel Hahler 7f519f8ab7 Merge master into features 2019-04-27 00:43:00 +02:00
Nikolay Kondratyev bc00d0f7db Fix handle repr error with showlocals and verbose output 2019-04-19 18:54:21 +03:00
Ilya Konstantinov d67d68f6d3 Eliminate core dependency on 'terminal' plugin 2019-04-17 11:19:19 -07:00
Samuel Searles-Bryant a37d1df089 Show XFail reason as part of JUnitXML message field 
Fixes #4907
 2019-04-11 22:26:05 +01:00
ApaDoctor cf6e2ceafd add ini option to disable string escape for parametrization 2019-03-28 00:07:28 +09:00
Takafumi Arakaki 62f96eea6b Include documentation 2019-03-15 11:14:50 +09:00
Bruno Oliveira 986dd84375
LoggingPlugin: Support to customize log_file from hook (#4752) 
LoggingPlugin: Support to customize log_file from hook
 2019-02-16 12:01:21 -02:00
Andras Mitzki e3824d23bc LoggingPlugin: Expose setting log_file_handler 
- This patch allows to set log_file (path) from hook

Signed-off-by: Thomas Hisch
Signed-off-by: Andras Mitzki <andras.mitzki@balabit.com>
 2019-02-15 16:05:10 +01:00
Daniel Hahler fc8800c71f
Merge pull request #4722 from fetzerch/ignore_wildcards 
Add ability to use globs when using --ignore
 2019-02-09 00:11:04 +01:00
Bruno Oliveira 2f083504ee
Merge pull request #4709 from namurphy/warns-docs 
Document how to customize test failure message for missing warnings
 2019-02-06 20:51:14 -02:00
Christian Fetzer fc5d4654e5 Add ability to exclude files matching glob patterns with --ignore-glob 
This adds the `--ignore-glob` option to allow Unix-style wildcards so
that `--ignore-glob=integration*` excludes all tests that reside in
files starting with `integration`.

Fixes: #3711
 2019-02-06 11:29:30 +01:00
Anthony Sottile 2264db7f4a
Merge pull request #4682 from arel/parameterize-conditional-raises-document-only 
Document parametrizing conditional raises
 2019-02-02 13:15:26 -08:00
Nick Murphy 8003d8d279 Update AUTHORS 2019-02-01 21:55:01 -05:00
Bruno Oliveira ade5f2c8c5 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2019-01-29 19:36:56 -02:00
Arel Cordero afe9fd5ffd Adds `does_not_raise` context manager 
Addressing issues #4324 and #1830
 2019-01-27 16:40:35 +00:00
Bruno Oliveira 9905a73ae0
Merge pull request #4511 from jhunkeler/junit-strict 
Toggle JUnit behavior with INI option
 2019-01-24 20:54:32 -02:00
Kristoffer Nordstroem e2cd2cd409 vanity commit 2019-01-24 23:18:21 +01:00
Adam Uhlir 04bd147d46
Fixes #4653 - tmp_path provides real path 2019-01-18 12:54:00 -08:00
Bruno Oliveira 1a04e8903a
Merge pull request #4537 from chdsbd/master 
Bugfix: monkeypatch.delattr handles class descriptors
 2019-01-16 08:09:59 -02:00
Joseph Hunkeler af2ee1e80a
Emit JUnit compatible XML 
* Remove non-standard testcase elements: 'file' and 'line'
* Replace testcase element 'skips' with 'skipped'
* Time resolution uses the standard format: 0.000
* Tests use corrected XML output with proper attributes
 2019-01-14 22:58:40 -05:00
Anton Lodder 77da4f118c Add changelog 4631 and AUTHOR credits for Anton Lodder 2019-01-10 20:48:51 -05:00
Oscar Benjamin 85055a9efe Show full repr with assert a==b and -vv 2019-01-08 01:25:05 +00:00
Bruno Oliveira 30c7a7bd69 Merge remote-tracking branch 'upstream/master' into features 2019-01-02 19:16:18 -02:00
Adam Johnson 388aff16c8 Improve detailed summary report docs 
The existing examples had 0 tests collected so didn't show the actual summary report. Also I added a section explaining the difference between `p` and `P`.
 2018-12-29 11:47:39 +00:00
Ronny Pfannschmidt e63c7a13ff
Merge pull request #4327 from ndevenish/approx 
Let approx() work on more generic sequences
 2018-12-17 15:21:12 +01:00
Christopher Dignam f8d31d2400 Bugfix: monkeypatch.delattr handles class descriptors 
Correct monkeypatch.delattr to match the correct behavior of
monkeypatch.setattr when changing class descriptors
 2018-12-12 15:20:24 -05:00
Andrey Paramonov b1e766c30e Update docs 2018-12-12 13:27:44 +03:00
Bruno Oliveira 33b877cc01 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-11-23 23:27:41 -02:00
Michael D. Hoyle 1568e38997 Use pkg_resources.parse_version in minver check 
Use pkg_resources.parse_version in minver check

Add meself to AUTHORS & changelog

Format CHANGELOG
 2018-11-19 11:25:27 -05:00
Nicholas Devenish 1a8d9bf254 Let approx() work on more generic sequences 
approx() was updated in 9f3122fe to work better with numpy arrays,
however at the same time the requirements were tightened from
requiring an Iterable to requiring a Sequence - the former being
tested only on interface, while the latter requires subclassing or
registration with the abc.

Since the ApproxSequence only used __iter__ and __len__ this commit
reduces the requirement to only what's used, and allows unregistered
Sequence-like containers to be used.

Since numpy arrays qualify for the new criteria, reorder the checks so
that generic sequences are checked for after numpy arrays.
 2018-11-18 20:01:11 +00:00
Aly Sivji a0ba881c22 Add change to log; name to AUTHORS 2018-11-12 09:28:47 -06:00
Fabien ZARIFIAN f48a26f59c
Update AUTHORS 2018-11-08 08:12:08 +01:00
Bruno Oliveira f947cb2613 Merge remote-tracking branch 'upstream/features' into davidszotten/stepwise 2018-10-20 09:18:02 -03:00
Sven-Hendrik Haase f694d8d6ad Make --color more colorful 2018-10-18 03:56:58 +02:00
David Szotten 126bb0760e authors 2018-10-15 20:04:39 +01:00
Bruno Oliveira 9646a1cd7a Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-10-15 12:55:28 -03:00
Tomer Keren 99d957bd3d Check off PR requirements 2018-10-15 11:36:31 +03:00
Kyle Altendorf 20902deb75 Add Kyle Altendorf to AUTHORS 2018-10-05 10:02:59 -04:00
Bruno Oliveira 1101a20408 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-10-02 18:13:54 -03:00
Zac-HD 6be2136f20 Ensure user_properties is a list 2018-09-26 22:04:50 +10:00
iwanb c61ff31ffa Fix #3539: reload module with assertion rewrite import hook 2018-09-23 13:05:55 +02:00
Andrea Cimatoribus 913c07e414 Add changelog file and new author 2018-09-15 09:18:03 +02:00
Bruno Oliveira 69b34f7658 Merge remote-tracking branch 'upstream/master' into release-3.8.0 2018-09-05 18:02:02 -03:00
Ronny Pfannschmidt 410d5762c0
Merge pull request #3919 from fabioz/master 
Improve import performance of assertion rewrite. Fixes #3918.
 2018-09-05 14:33:40 +02:00
CrazyMerlyn b01704cce1 Fix exit code for command line errors 
Fixes #3913
 2018-09-03 04:16:35 +00:00
Fabio Zadrozny d53e449296 Improve performance of assertion rewriting. Fixes #3918 2018-08-31 12:27:08 -03:00
dhirensr 95881c870e T3566,T3546: added a blurb in usage.rst for usage of flag -r 2018-08-31 11:20:15 +05:30
dhirensr 3035b2724d T3853:removed needless message printed with --failed-first,--last-failed and no failed tests 2018-08-30 16:01:42 +05:30
Bruno Oliveira 2f2d5861bb Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-08-26 16:45:00 -03:00
Jennifer Rinker a12eadd9ef resolving Issue #3824 - expanding docs 2018-08-22 15:37:35 +02:00
Bruno Oliveira 044d2b8e6e
Merge pull request #3838 from wimglenn/runresult_xfail 
Support xfailed and xpassed outcomes in RunResult.
 2018-08-20 20:01:51 -03:00
wim glenn 539a22c750
Added support for xfailed and xpassed outcomes to the ``pytester.RunResult.assert_outcomes`` signature. 2018-08-20 01:24:19 -05:00
Bruno Oliveira c64a8c9c7f Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-08-18 15:54:53 -03:00
Victor f66764e1c0 Added changelog and updated AUTHORS. 2018-08-17 00:33:56 +02:00
Sankt Petersbug 78ef531420 corrected the position of myname 2018-08-14 20:33:55 -05:00
Sankt Petersbug cb77e65c97 updated AUTHORS 2018-08-14 16:16:25 -05:00
Virgil Dupras 126896f69d Add option to disable plugin auto-loading 
If `PYTEST_DISABLE_PLUGIN_AUTOLOAD` is set, disable auto-loading of
plugins through setuptools entrypoints. Only plugins that have been
explicitly specified are loaded.

ref #3784.
 2018-08-07 13:16:28 -04:00
Tadek Teleżyński d2fe619120 Fix truncated locals in verbose mode 2018-07-15 11:30:26 -03:00
Bruno Oliveira 3c19370cec Merge remote-tracking branch 'upstream/features' into jonozzz/features 2018-07-05 18:15:17 -03:00
Bruno Oliveira 8680dfc939
Merge pull request #3629 from egnartsms/issue-2220-param-breaks-dep 
Make test parametrization override indirect fixtures
 2018-06-28 21:43:21 -03:00
Serhii Mozghovyi 76ac670f7d Add changelog description 2018-06-28 23:42:18 +03:00
Ronny Pfannschmidt 89e0a3ec27 merge from master to features 2018-06-26 17:01:05 +02:00
Marcelo Duarte Trevisani 0030ceb11c Bug fix #3593 - approx method in a single element of numpy array 
If the user pass as a expected value a numpy array created like
numpy.array(5); it will creates an array with one element without shape,
when used with approx it will raise an error
'TypeError: iteration over a 0-d array'
 2018-06-25 22:55:16 +02:00
Ondřej Súkup deff54aae0
Try import mock, but on python 3.3+ can use also stdlib unittest.mock 
From Python 3.3 is mock part of python standard library in unittest namespace
 2018-06-23 23:27:07 +02:00
Wil Cooley 3615977608 Add `messages` property to `caplog` fixture. 2018-06-14 12:22:33 -07:00
Guoqiang Zhang a888bf182e Continue to call finalizers in the stack when a finalizer in a former scope raises an exception 2018-06-11 18:01:18 -04:00
Bruno Oliveira c55db1faac Merge remote-tracking branch 'upstream/master' into release-3.6.0 2018-05-23 00:03:58 +00:00
Miro Hrončok 5072226f69 Import Mapping and Sequence from compat in python_api::approx 
Related to https://github.com/pytest-dev/pytest/issues/3339

Fixes a DeprecationWarning on Python 3.7

Adds Mapping to compat
 2018-05-22 22:25:15 +02:00
Bruno Oliveira 674879976f Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-05-18 12:30:08 -03:00
aviral1701 f14e097635 added changelog and added my name to the authors 2018-05-15 12:54:48 +05:30
turturica 7d923c389e Merge remote-tracking branch 'upstream/features' into features 2018-04-18 00:11:03 -07:00
turturica 2b1410895e Add package scoped fixtures #2283 2018-04-11 15:39:42 -07:00
Bruno Oliveira 10a7160549 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-04-11 18:07:47 -03:00
Ronny Pfannschmidt 2241c98b18
Merge pull request #3331 from tonybaloney/breakpoint_support 
Support for the new builtin breakpoint function in Python 3.7
 2018-04-10 07:15:29 +02:00
Tim Strazny ec2d8223cf Fix issue #3372 2018-04-06 14:16:12 +02:00
Bruno Oliveira 2962c7367c
Merge pull request #3307 from KKoukiou/rhv-qe-fix 
logging.py: Don't change log level of the root logger to bigger numeric value
 2018-03-27 18:03:22 -03:00
Katerina Koukiou d895f5d6fc logging.py: Don't change log level of the root logger to bigger numeric value 2018-03-26 10:11:49 +02:00
Anthony Shaw 1ec99132e6
add myself to authors 2018-03-23 15:31:57 +11:00
Bruno Oliveira f3c87a77a7 Merge remote-tracking branch 'upstream/master' into release-3.5.0 2018-03-21 20:39:44 +00:00
Jeffrey Rackauckas 9b449eee15 Add self to authors 2018-03-18 21:28:20 -07:00
Bruno Oliveira 1fff81e21d Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2018-03-16 18:15:28 -03:00
Kostis Anagnostopoulos 02bec7a3bb Add changelog & myself (ankostis) to authors 2018-03-13 01:46:44 +02:00
Bruno Oliveira a2a64546eb Merge remote-tracking branch 'upstream/master' into features 2018-02-27 16:43:45 -03:00
William Lee 8d90591b33 Merge remote-tracking branch 'upstream/features' into continue-on-failure 2018-02-22 21:01:31 -06:00
William Lee fbc45be83f Fixed #3149 where doctest does not continue to run when there is a failure 2018-02-22 21:00:54 -06:00
Allan Feldman 287c003cfd Add myself to AUTHORS. 2018-02-21 22:42:44 -08:00
Carlos Jenkins 8b49ddfa58 Renamed the fixture record_xml_property to record_property and adapted logic so that the properties are passed to the TestReport object and thus allow compatibility with pytest-xdist. 2018-02-20 15:46:26 -06:00
Bruno Oliveira 69d608aec3 Merge remote-tracking branch 'upstream/master' into merge-upstream 2018-02-17 09:38:06 -02:00
Jordan Speicher 774c539f1a Add --deselect command line option 
Fixes #3198
 2018-02-16 08:17:37 -06:00
Brian Maissy 7656fc8320 Added printing of captured stdout and stderr before entering pdb 2018-02-12 23:17:51 +02:00
Bruno Oliveira ce0a9aadec
Merge pull request #3127 from feuillemorte/1642-add-rootdir-option 
#1642 add rootdir option
 2018-02-07 18:18:59 -02:00