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
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
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
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
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
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
71c5883d52
update according to discussion on pytest-dev and in PR
2015-09-22 10:21:01 +02:00
c30eafa254
Update changelog for merged PR.
2015-09-21 14:59:48 +01:00
7c3be72ac7
Merge pull request #1042 from Bjwebb/issue411
...
Add __eq__ method to assertion comparison example
2015-09-21 14:57:59 +01:00
622e64320a
Add __eq__ method to assertion comparison example
...
This makes the example make more sense, because now Foo(1) == Foo(1) is
true. Fixes #411
2015-09-21 14:23:26 +01:00
0efcfeed17
adapt contributing to new versioning and to python3.5 as latest.
2015-09-21 14:04:30 +02:00
65de43e67d
Mention fix for issue 766 in changelog
...
Fixes issue #766 .
2015-09-21 12:21:24 +01:00
cd4557cce8
Merge pull request #1036 from russel/rlw_766
...
Remove references to distutils as per Issue 766.
2015-09-21 12:19:14 +01:00
714a97e452
Remove references to distutils as per Issue 766.
2015-09-21 12:00:48 +01:00
80897f62a6
Merge pull request #974 from nicoddemus/addoption-conftest
...
Add warning about implementing pytest_addoption in conftest files
2015-09-21 11:28:31 +01:00
dfd83b59f8
Merge pull request #1033 from mbirtwell/changes_to_contributing_rst
...
contributing: Add instructions from PyCon
2015-09-21 11:13:14 +01:00
bb42e43ee7
contributing: Add instructions from PyCon
...
At PyCon we realised that the virtualenv created in the make file wasn't
used in the subsequent steps in CONTRIBUTING.rst. This change removes the
reference the make and suggesting installing tox directly.
Also changed the explanation that follows to make more sense with this
change
2015-09-21 10:56:05 +01:00
8fe5c704e3
Merge pull request #1024 from rouge8/tmpdir-uid-not-found
...
Make tmpdir resiliant to user ids that do not exist
2015-09-18 22:53:17 -03:00
b1c9b8b415
Make tmpdir resiliant to user ids that do not exist
...
Previously, the tmpdir fixture would fail if the current process's user
id does not correspond to a valid user (e.g. running pytest in a Docker
container with 'docker run -u').
2015-09-18 21:26:19 -04:00
7658f60146
#877 - reencoding causes typeerrors on python2
2015-09-19 00:30:01 +02:00
49c99a41ea
reencode non-ascii python2 assertion reprs, fixes #877
...
i decided against using a warning since the problem goes away with python3
the support code can be removed once we drop python2 in 10 years or so
2015-09-19 00:30:01 +02:00
Florian Bruhin
Bruno Oliveira
Tim Staley
Florian Bruhin
Ronny Pfannschmidt
Michael Howitz
holger krekel
Abhijeet Kasurde
holger krekel
Floris Bruynooghe
Ben Webb
Russel Winder
Michael Birtwell
Andy Freeland