fcc20d4181
Merge pull request #1257 from nicoddemus/merge-master-into-features
...
Merge master into features after 2.8.5
2015-12-12 08:15:55 +01:00
6ac31088c5
Merge branch 'master' into merge-master-into-features
2015-12-11 23:13:50 -02:00
7eea6b3b02
Add 2.8.6.dev1 to CHANGELOG
2015-12-11 23:11:36 -02:00
e87facfb22
Bump master to 2.8.6.dev1
2015-12-11 23:07:30 -02:00
855b115dab
Remove plugins_index generation from HOWTORELEASE
2015-12-11 22:35:44 -02:00
4263b8b407
Restore regen-doc result
2015-12-11 22:34:16 -02:00
7d150c20cf
Regenerate 2.8.5 docs.
2015-12-11 22:28:23 -02:00
a124163425
Prepare for 2.8.5: bump version, CHANGELOG, announce
2015-12-11 19:20:07 -02:00
2382546112
Merge pull request #1252 from nicoddemus/optimize-app-veyor
...
Optimize appveyor build
2015-12-11 16:10:45 +01:00
946bb08da5
Tyding up the CHANGELOG
2015-12-11 00:36:26 -02:00
85d1f0404a
Merge pull request #1243 from aselus-hub/master
...
Update python.py
2015-12-11 00:33:46 -02:00
1d60f61ba8
Optimize appveyor build
...
- AppVeyor does not run matrix builds in parallel, so creating a matrix with the intent to
speed up the build will actually result in longer build times, as each matrix will execute
in a brand new VM.
- tox does not detect 64 bit installations in AppVeyor, it always installs interpreters
from C:\PythonX.Y, so there's no point to have 64bit builds
- No need for the auxiliary script "install.ps1" because all python versions we are interested
in are already pre-installed in AppVeyor
2015-12-11 00:20:20 -02:00
ad05cbe6da
fixed meesage.
2015-12-10 15:39:31 -08:00
1216a27b44
added docstrign to inection collection test.
2015-12-10 15:19:08 -08:00
2b2240e904
added myself to authors, added changelog entry.
2015-12-10 15:15:09 -08:00
74f7efd2a3
added line comparison that is pytest-sugar agnostic.
2015-12-10 15:10:55 -08:00
34db8aed34
added verification that test actually passed.
2015-12-10 15:02:57 -08:00
926c6028bb
Merge pull request #1250 from nicoddemus/merge-master-into-features
...
Merge master into features
2015-12-10 20:56:10 -02:00
af54e09759
nit: fixed newline
2015-12-10 14:46:51 -08:00
dfaeefd692
added test to verify injection.
2015-12-10 14:45:36 -08:00
86b6ce5042
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2015-12-10 19:41:14 -02:00
8f880e1625
Fix CHANGELOG merge
2015-12-10 19:40:45 -02:00
46c85bc352
Merge pull request #1249 from nicoddemus/remove-plugins-index
...
Remove plugins_index from the docs
2015-12-10 19:11:32 -02:00
8b61a332ba
Merge remote-tracking branch 'bukzor/features-merge-master' into features
2015-12-10 19:03:55 -02:00
139c97930b
Remove plugins_index from the docs
...
Fix #1229
2015-12-10 19:00:01 -02:00
9cfee82f9b
Merge pull request #1247 from alex/patch-1
...
Use https for images in readme
2015-12-10 00:02:47 +01:00
c0a5f3df10
Use https for images in readme
2015-12-09 18:01:36 -05:00
8220c05b01
Merge pull request #1245 from RonnyPfannschmidt/howtorelease
...
add a reminder of the features branch merge to HOWTORELEASE.rst
2015-12-09 18:34:41 -02:00
d0f5f6676b
add a reminder of the features branch merge to HOWTORELEASE.rst
2015-12-09 21:20:54 +01:00
ec02f694ef
Update python.py
...
updated dictionary itteration to create a list for generation, so that tests can be added in the generator functions under python3. This works fine as-is in python2 because python 2 already creates a list, whereas python3 returns an itterator. Forcing a list format for the return fixes python3 to work the same way as python2
2015-12-09 11:32:19 -08:00
6351e2846c
Merge pull request #1232 from codewarrior0/report-passing-option
...
Add -rp and -rP options to report passing tests.
2015-12-09 06:57:42 +01:00
1c70827f33
Merge pull request #1241 from nicoddemus/fix-deprecated-call-args
...
Fix deprecated_call regression introduced in 2.8.4
2015-12-09 06:48:43 +01:00
ccfd962170
Add "no -rP" case to test_pass_output_reporting
2015-12-08 17:33:03 -10:00
b417d7cb79
Add tests to test_terminal.py for -rp and -rP
2015-12-08 15:54:23 -10:00
1c46462991
Fix deprecated_call regression introduced in 2.8.4
...
Fix #1238
2015-12-08 22:40:05 -02:00
5ccb7b1ced
update test_recwarn to new style
2015-12-08 11:08:33 -08:00
eabf2f9091
Merge branch 'master' into features
...
Conflicts:
AUTHORS
_pytest/__init__.py
_pytest/hookspec.py
_pytest/recwarn.py
testing/test_recwarn.py
2015-12-07 14:28:59 -08:00
1db4cbcc9f
Update AUTHORS and CHANGELOG
2015-12-07 12:17:30 -10:00
fbac936596
Add -rp and -rP options to report passing tests.
...
-rP is an alternative to `-s` for viewing the output of passing tests.
This causes the captured stdout/stderr of passing tests to be output in
the same way as that of failing tests.
-rp adds a simple one-line-per-test summary for passing tests.
Neither option is included by -ra.
Additional changes to `pytest_capturelog` and `pytest_catchlog` are
needed for this option to also output captured logs: They must be
changed to use `rep.sections.add` instead of `rep.longrepr.addsection`,
and to add these additional sections even if the test passes, since
passing tests don't seem to have a `longrepr` at report time.
2015-12-07 11:32:56 -10:00
ffa572531a
Merge pull request #1091 from RonnyPfannschmidt/fix-1074
...
fix issue 1074 and clean up junitxml
2015-12-07 22:13:16 +01:00
fde2a6f5fd
add changelog entry
2015-12-07 21:58:34 +01:00
7b7737bf96
handle duplicate test ids via collection and xdist each reporting
2015-12-07 21:54:25 +01:00
04e9ae75c8
add xfailing test for double test id failure
2015-12-07 21:54:25 +01:00
9ea7826427
Junitxml: correct node reporter attribute names
2015-12-07 21:54:25 +01:00
09cc45b0c5
junitxml: correct docstring of make_properties_node
2015-12-07 21:54:25 +01:00
0aa54101c9
junitxml: follow Bruno's attribute/method naming hint from the review
2015-12-07 21:54:25 +01:00
5eef6a2821
junitxml: fix python3 compat of the tests
2015-12-07 21:54:25 +01:00
518c88f149
finalize nodereporters by throwing away the intermediate xml nodes, fixes issue #1074
2015-12-07 21:54:25 +01:00
5f5a7995b9
reintroduce junitxml report order and debug cleanups
2015-12-07 21:54:24 +01:00
0528e5b45f
junitxml: intermediate, move testcase generation to NodeReporter
2015-12-07 21:54:24 +01:00
Ronny Pfannschmidt
Bruno Oliveira
Florian Bruhin
aselus-hub
Alex Gaynor
aselus-hub
David Vierra
Buck Golemon