06a70b6d6d
Merge pull request #982 from codewarrior0/patch-1
...
Add notes to docstring of `monkeypatch.undo()`
2015-08-31 21:18:53 -03:00
18d175708c
Merge pull request #983 from The-Compiler/issue-979
...
Fix overriding of fixtures with parametrization.
2015-08-31 15:21:45 +02:00
19791546da
Add docstring.
2015-08-31 15:11:57 +02:00
885e461ae3
Fix overriding of fixtures with parametrization.
...
Fixes #979 , see #926 .
2015-08-31 14:38:39 +02:00
3a27cd87ce
Adjust phrasing in monkeypatch.undo docstring
...
s/test invocation/test function invocation/
2015-08-29 19:00:00 -10:00
6380e19f07
Add notes to docstring of `monkeypatch.undo()`
...
Note that calling `undo()` is generally not needed, and describe the "gotcha" discovered in #981 .
2015-08-29 16:53:57 -10:00
c0eec5d61c
Merge pull request #975 from nicoddemus/fix-regression-parse-known-args
...
Fix regression caused by changing the signature for parse_known_args
2015-08-29 23:44:32 -03:00
c493f263b6
Merge branch 'Elizaveta239-master' closes #908
2015-08-29 17:34:35 +10:00
553aef57aa
Merge pull request #978 from nicoddemus/string-diff
...
Show a few diff lines when truncating string diffs
2015-08-28 09:04:39 +01:00
9f30ae9850
Merge pull request #977 from nicoddemus/marks-fixtures-note
...
Add note that using marks on fixtures is not supported
2015-08-28 06:16:49 +02:00
dd7112d5ea
Show a few diff lines when truncating string diffs
...
Fix #934
2015-08-27 22:20:13 -03:00
b49bedcf0c
Merge branch 'master' of git://github.com/Elizaveta239/pytest into Elizaveta239-master
2015-08-28 11:10:22 +10:00
87cb5bc5b7
Add note that using marks on fixtures is not supported
...
Fix #964
2015-08-27 20:11:18 -03:00
4533a50542
Fix regression caused by changing the signature for parse_known_args
...
Fix #973
2015-08-27 19:35:32 -03:00
06b1b69fb7
Merge pull request #963 from nicoddemus/cookiecutter-docs
...
Mention cookie-cutter in the docs and fix broken links to <extplugin>
2015-08-26 16:41:56 -03:00
333cb27272
Merge pull request #961 from nicoddemus/args-after-options
...
Paths after normal options are now properly used to discover rootdir and ini files
2015-08-26 12:50:19 -03:00
d988d2006f
Mention cookie-cutter in the docs and fix broken links to <extplugin>
2015-08-25 23:59:18 -03:00
42b43a7d7b
Paths after normal options are now properly used to discover rootdir and ini files
...
Fix #949
2015-08-25 22:08:05 -03:00
e67d66a5d4
Merge branch 'pytest-dev'
...
# Conflicts:
# AUTHORS
2015-08-24 22:55:11 +03:00
b25e41e348
Merge pull request #956 from nicoddemus/record-xml-property
...
add preliminary support for extended junit xml properties
2015-08-24 09:13:04 +02:00
70da93145d
Improve docs and using warning system for record_xml_property fixture
2015-08-23 11:56:27 -03:00
a20c6d072d
Fix getdoctarget to ignore comment lines
2015-08-23 11:20:34 -03:00
06585f5bdd
Always report error about parametrize data that doesn't correspond to fixtures in test functions.
2015-08-23 13:42:40 +03:00
44d9365da0
Add warning of "preliminary feature" to record_xml_property
2015-08-21 15:21:12 -06:00
2ddbac1f98
Correcting implementation based on pull request feed back
2015-08-21 14:31:53 -06:00
287df16c9c
Merge pull request #817 from nicoddemus/non-collection-exit-error
...
return non-zero exit code if no tests are collected
2015-08-21 18:30:57 +02:00
5f0e92a432
Merge pull request #942 from RonnyPfannschmidt/adapt-print
...
Adapt plugin name printing
2015-08-21 12:02:58 -03:00
d7d418cd47
Fix forked_run_report in pytest.xdist 1.13
2015-08-20 21:17:27 -04:00
24212fd97f
Add support to record custom properties on xml output
2015-08-20 17:55:38 -06:00
3e41c3cbb3
Using packages from pypi
2015-08-18 09:19:51 -03:00
359f248729
Force to use xdist >= 1.13
2015-08-18 07:35:03 -03:00
f730291904
Make testsfailed and testscollected public Session attributes
...
As suggested by @flub in review
2015-08-18 07:35:02 -03:00
2ffd37b816
return non-zero exit code if no tests are collected
...
Fix #812
Fix #500
2015-08-18 07:35:02 -03:00
7758bcd141
terminalwriter: extract plugin printing logic and add positive unittests
2015-08-17 09:10:01 +02:00
740a97a8cc
terinalwriter: use dash between plugin name and version
2015-08-17 08:48:38 +02:00
2c42f15e00
adapt plugin printing
...
* print each distribution only once(xdist now has 3 entrypoints)
* include the distribution version
2015-08-17 08:41:24 +02:00
37ed391cc2
Merge pull request #938 from nicoddemus/doctest-unicode
...
New ALLOW_UNICODE doctest option
2015-08-16 11:35:10 +02:00
f22d14b105
Merge pull request #879 from RonnyPfannschmidt/setuptools-scm
...
use setuptools_scm to determine the version
2015-08-15 00:56:16 +01:00
d749021a31
Fix coverage
...
Also make sure a test that doesn't set ALLOW_UNICODE fails
on Python 2 and passes Python 3.
2015-08-12 22:49:41 -03:00
93aee0f814
Add docs and CHANGELOG for ALLOW_UNICODE option
2015-08-12 22:17:15 -03:00
420823070b
Add ALLOW_UNICODE doctest option
...
When enabled, the ``u`` prefix is stripped from unicode strings in
expected doctest output. This allows doctests which use unicode
to run in Python 2 and 3 unchanged.
Fix #710
2015-08-12 22:16:44 -03:00
ddbdcab522
Merge pull request #937 from ctheune/patch-1
...
Fix accidental inversion in skip example.
2015-08-12 07:51:59 +02:00
2174f3ce37
Fix accidental inversion in skip example.
2015-08-12 07:38:04 +02:00
73fdda0e45
Merge pull request #926 from untitaker/multifixture
...
Don't skip fixtures that are substrings of params
2015-08-10 21:12:51 -03:00
1d5215ab4f
Add myself to authors
2015-08-11 00:47:18 +02:00
cafd71eb29
Update changelog for #926
...
Also fix some inconsistencies in the changelog on the way.
2015-08-11 00:47:18 +02:00
41cef6f5f2
Don't skip fixtures that are substrings of params
...
Bug introduced with
https://bitbucket.org/pytest-dev/pytest/pull-requests/257/allow-to-override-parametrized-fixtures
Fix #736
2015-08-11 00:41:21 +02:00
681e502c12
Use "union" merge strategy for CHANGELOG
...
Credits: @The-Compiler 😄
2015-08-10 19:27:22 -03:00
bc509b42e8
Merge pull request #933 from nicoddemus/hasplugin
...
Reintroduce hasplugin to PytestPluginManager
2015-08-10 09:40:52 +02:00
e103932aad
Reintroduce hasplugin to PytestPluginManager
...
Fix #932
2015-08-09 19:30:49 -03:00
Bruno Oliveira
Anatoly Bubenkov
Florian Bruhin
David Vierra
Brianna Laugher
Floris Bruynooghe
Florian Bruhin
elizabeth
Ronny Pfannschmidt
David Diaz
Christian Theune
Markus Unterwaditzer