bc501a28af
Merge pull request #1070 from oleg-alexandrov/master
...
Documentation clarification
2015-09-26 03:16:44 -03:00
9d2d2d17af
Clarify documentation
...
Fix doc markup
2015-09-25 21:46:06 -07:00
b403395cdb
Reorganize "Contents" page
...
Change the organization in a more logical way to a newcomer
2015-09-26 01:09:50 -03:00
fbce3bb48f
Small format fixes in HOWTORELEASE
2015-09-25 23:10:35 -03:00
bf23a0f4b8
Merge pull request #1065 from The-Compiler/doc-fixes
...
Doc fixes
2015-09-25 19:18:09 +02:00
448ec8b740
Mark sources correctly in parametrize.rst.
...
Sphinx didn't pick this up as monospace text.
2015-09-25 18:43:33 +02:00
272f987b0c
Fix test_time in parametrize doc.
...
The source was indented with a mixture of tabs and spaces, causing syntax
errors when executed.
2015-09-25 18:42:06 +02:00
0ebac22bb2
Regenerate fixture list doc with cache docstring.
2015-09-25 18:41:07 +02:00
c55e42f856
Merge pull request #1063 from timstaley/docs-module-level-fixtures-pytestmark
...
Docs: Fixtures page - clarify usage of module-level pytestmark.
2015-09-25 12:42:35 -03:00
eb2caa554c
Docs: Fixtures page - clarify usage of module-level pytestmark.
...
It certainly wasn't clear to me that the variable assigned by
pytest.mark.usefixtures should also be called pytestmark,
so I was confused when::
foo = pytest.mark.usefixtures('fixture_bar')
wasn't behaving as expected; correct usage is of course::
pytestmark = pytest.mark.usefixtures('fixture_bar')
I assume this is by design, otherwise that's a separate issue, at
least current behaviour should be documented.
2015-09-25 14:57:08 +01:00
7c5d2ea81d
Merge pull request #1046 from RonnyPfannschmidt/docs
...
fix documentation regeneration, kill Makefile
2015-09-25 08:35:18 +02:00
4867554eec
Merge branch 'master' into features
2015-09-23 16:42:42 +02:00
acb6b186f2
Merge pull request #1056 from icemac/patch-1
...
Remove duplicate line.
2015-09-23 09:10:20 +02:00
a3fdcd9b17
Merge pull request #1031 from pytest-dev/unmarshable-parametrize
...
Parametrized values containing non-ascii bytes break cache
2015-09-23 09:03:51 +02:00
e5c76cb22d
Merge pull request #1054 from nicoddemus/cache-fixture-docstring
...
Add docstring to cache fixture
2015-09-23 09:00:01 +02:00
730114d088
Remove duplicate line.
2015-09-23 08:53:13 +02:00
c0c685a5de
Merge pull request #1055 from nicoddemus/fix-help-pytest-warnings
...
(w)warnings -> (w)pytest-warnings in "-r chars" help
2015-09-23 06:53:46 +02:00
79ebca3f30
(w)warnings -> (w)pytest-warnings in "-r chars" help
2015-09-23 01:09:09 -03:00
25d2cc4604
Add docstring to cache fixture
...
Fixes #1049
2015-09-22 23:46:05 -03:00
716fa97fa1
Update CHANGELOG
2015-09-22 23:21:36 -03:00
e1063678f1
escape bytes when creating ids for parametrized values
2015-09-22 23:18:09 -03:00
661495e5c5
Write failing test for parametrized tests with unmarshable parameters
...
Related to #1030 ; committing directly to pytest repository to
get feedback from others on how to proceed.
2015-09-22 23:18:07 -03:00
9d1ae0a149
Merge pull request #1048 from RonnyPfannschmidt/pytest-1029
...
fixes #1029 by handling access errors for cache dirs as pytest warning
2015-09-22 19:04:04 -03:00
7f776fe19a
skip chmod using cache access warning tests on windows
2015-09-22 20:49:11 +02:00
c10f483b9f
Don't hardcode 'std' for captured stdout/stderr.
...
This will make Item.add_report_sect more usable for plugins.
See https://github.com/eisensheng/pytest-catchlog/pull/7
2015-09-22 20:29:16 +02:00
ea9a491fb3
add an acceptance test for cache write errors
2015-09-22 20:24:37 +02:00
ca460e11e6
Merge pull request #1051 from Akasurde/issue_1027
...
Added minor documentation change in python.py
2015-09-22 17:09:25 +02:00
c3588b545f
generate docs on python3.4
2015-09-22 16:52:35 +02:00
dc1ce51ac2
Added minor documentation change
...
Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
2015-09-22 20:15:49 +05:30
6e51918353
update changelog
2015-09-22 16:33:27 +02:00
1d2afada83
Minor typo in CHANGELOG
2015-09-22 11:30:00 -03:00
29f4da93d4
handle access errors when writing cache files silently as pytest warning, fixes #1039
2015-09-22 16:28:19 +02:00
5acbd7bc86
Fix git checkout command in CONTRIBUTING.rst
2015-09-22 10:54:37 -03:00
36924b59bd
Merge branch '653-deprecated-context-manager' of https://github.com/chiller/pytest into features
2015-09-22 15:14:06 +02:00
5ff75a41ea
fix erroring doc example
2015-09-22 15:05:56 +02:00
89badfec0c
update regendoc, substitutes PYTHON_PREFIX
2015-09-22 14:48:04 +02:00
662d755974
fix documentation gegeneration, kill Makefile
2015-09-22 14:22:37 +02:00
7c088d1104
remove nonsense line
2015-09-22 11:23:24 +02:00
48df2f6842
Merge branch 'master' into features
2015-09-22 11:23:05 +02:00
bf9b94595c
fix changelog
2015-09-22 11:18:19 +02:00
41d61ed221
Merge pull request #1023 from RonnyPfannschmidt/fix-877
...
Fix 877
2015-09-22 11:17:02 +02:00
79587d4b70
Merge branch 'master' into features
...
Conflicts:
_pytest/__init__.py
2015-09-22 11:06:21 +02:00
8a4517fd17
re-add 2.8.x changelog so that MASTER can be merged into features wrt
...
to the changelog
2015-09-22 11:05:19 +02:00
97f7815feb
also change pytest version to target 2.9.0
2015-09-22 11:01:33 +02:00
d8fbb0b8e3
start features branch
2015-09-22 11:00:55 +02:00
e2f72ffed8
start bugfix changelog on master
2015-09-22 10:59:23 +02:00
79c2abf531
Merge pull request #1038 from hpk42/newbranching
...
adapt contributing to new versioning and to python3.5 as latest.
2015-09-22 10:55:30 +02:00
a5ff345f7b
fix another occurence of "macro" to "major"
2015-09-22 10:45:55 +02:00
f19ba6c2b1
fix naming
2015-09-22 10:29:12 +02:00
745cd26850
Merge branch 'master' into newbranching
2015-09-22 10:22:05 +02:00
Bruno Oliveira
Oleg Alexandrov
Ronny Pfannschmidt
Florian Bruhin
Tim Staley
Florian Bruhin
holger krekel
Michael Howitz
holger krekel
Abhijeet Kasurde