69d608aec3
Merge remote-tracking branch 'upstream/master' into merge-upstream
2018-02-17 09:38:06 -02:00
fa8354e872
Merge pull request #3213 from thisch/collection_deselection
...
Show deselection count before tests are executed
2018-02-17 09:03:26 -02:00
00d3001138
Merge pull request #3188 from s0undt3ch/issues/3184
...
Don't traceback on unkown sections.
2018-02-17 09:02:44 -02:00
774c539f1a
Add --deselect command line option
...
Fixes #3198
2018-02-16 08:17:37 -06:00
df2f019997
Slight rewording in the CHANGELOG
2018-02-15 19:45:05 -02:00
6bc45d158d
Merge pull request #3186 from brianmaissy/bugfix/print_captured_stdout_before_entering_pdb
...
Added printing of captured stdout before entering pdb
2018-02-15 19:38:23 -02:00
6496131b79
Show deselection count before tests are exectued
...
Fixes #1527
2018-02-13 22:27:02 +01:00
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
ffee213c85
Update and rename 3202.trivial.rst to 3202.doc.rst
2018-02-09 22:51:15 -02: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
c04e248de5
Rename 3161.bugfix to 3161.bugfix.rst
2018-02-09 14:06:24 -02:00
3685c1bc01
Merge pull request #3192 from nicoddemus/pr-template
...
Add changelog/README.rst and streamline our PR template text
2018-02-08 19:20:54 +01:00
71367881ed
#1478 Added --show-capture=both option (fix comments)
2018-02-08 16:21:22 +03:00
eea169e515
Code review suggestions
2018-02-08 08:03:14 -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
40d0ade2d9
Add changelog/README.rst and streamline our PR template text
...
This streamlines the PR template text and adds a more in-depth explanation
about how the changelog entries work because this topic is a common source of
confusion:
- How to name the files.
- Which formatting to use (people in general assume it is Markdown).
- Recommend adding `.rst` extension to changelog files to help with the
above (`towncrier` doesn't care).
This was heavily inspired by the excellent python-trio/trio docs.
2018-02-06 22:20:39 -02:00
1a650a9eb9
#1478 Added --show-capture option
2018-02-06 23:38:51 +03:00
ea06c1345f
Update changelog wording slightly
2018-02-06 15:45:37 +00:00
67558e0e22
Additionally handle logstart and logfinish hooks
2018-02-06 15:45:36 +00:00
7152707280
Update changelog entry to "trivial" as it is a temporary workaround
...
I think this is a more appropriate category given that the underlying problem still exists
2018-02-06 08:54:44 -02:00
42c1f85257
Update CHANGELOG
2018-02-05 20:07:42 -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
ea8997a108
Update wording in CHANGELOG
2018-02-03 20:21:06 -02:00
867344d0d7
move import to top
2018-02-04 00:03:17 +02:00
74633815aa
skip failing pdb/doctest test on mac
2018-02-03 23:24:11 +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
3425edd2a5
Reword changelog a bit
2018-02-01 19:54:51 -02:00
4458e65fe7
Fix ordering of tests to minimize fixture creating
2018-02-01 13:07:45 -08:00
9f1772e679
#1642 Resolve conflicts
2018-02-01 00:18:28 +03:00
949a620d3a
#1478 Added --no-stdout option
2018-01-31 22:36:28 +03:00
ef7df8f167
Small update to CHANGELOG
2018-01-30 21:40:14 -02: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
489e638b4e
Preparing release version 3.4.0
2018-01-30 19:47:56 +00: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
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
77de45cce3
enhance docs for empty_parameter_set_mark according to review comments
2018-01-26 12:01:27 +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
4285325cb8
Added note that calling pytest.main multiple times from the same process is not recommended because of import caching
2018-01-25 23:07:34 +02:00
Bruno Oliveira