floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,167 Commits 32 Branches 205 Tags
42a5d6bdfa620fc13809c861a05077ef6d6f2a6a
Commit Graph

6167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bruno Oliveira
42a5d6bdfa Add __future__ imports to all pytest modules 
This prevents silly errors from creeping in Python 2 when testing in Python 3
 2017-03-16 22:45:40 -03:00
Bruno Oliveira
7684b3af7b Recommend using py36 for testing on CONTRIBUTING 2017-03-16 22:20:38 -03:00
Bruno Oliveira
5482dfe0f3 Merge pull request #2303 from nicoddemus/recwarn-refactor 
Refactor recwarn to use warnings.catch_warnings instead of custom code
 2017-03-15 12:27:31 -03:00
Bruno Oliveira
55b891ddd0 Merge pull request #2312 from nicoddemus/merge-master-into-features-post-3.0.7 
Merge master into features post 3.0.7
 2017-03-14 23:26:43 -03:00
Bruno Oliveira
6c9011c12f Merge branch 'master' into merge-master-into-features-post-3.0.7 2017-03-14 18:10:23 -03:00
Bruno Oliveira
fa15ae7545 Post 3.0.7 release handling 2017-03-14 18:07:44 -03:00
Bruno Oliveira
5056d8cbe8 Merge pull request #2304 from nicoddemus/release-3.0.7 
Release 3.0.7
 2017-03-14 18:03:44 -03:00
Ronny Pfannschmidt
5e52a4dda4 Merge pull request #2307 from nicoddemus/clarify-record-xml-property 
Clarify that record_xml_property is experimental, not junitxml
 2017-03-14 09:39:12 +01:00
Bruno Oliveira
92b49d246e Clarify that record_xml_property is experimental, not junitxml 
Related to #2306
 2017-03-13 23:04:44 -03:00
Bruno Oliveira
90c934e25e Include release 3.0.7 announce in index.rst 3.0.7 2017-03-13 18:59:15 -04:00
Bruno Oliveira
3c07072bfd Fix test_recwarn in Python 3.6 
No longer test for implementation details of recwarn since warnings.catch_warnings has changed
significantly in 3.6.
 2017-03-13 19:52:35 -03:00
Bruno Oliveira
d58780f9a6 Update regendoc 2017-03-13 18:41:20 -04:00
Bruno Oliveira
b1ab2ca963 Bump to version 3.0.7 and update CHANGELOG 2017-03-13 18:37:49 -04:00
Bruno Oliveira
22864b75ee Refactor recwarn to use warnings.catch_warnings instead of custom code 
Since we dropped 2.5, we can now use warnings.catch_warnings to do the
"catch warnings" magic for us, simplifying the code a bit.
 2017-03-13 19:28:36 -03:00
Bruno Oliveira
d1ea7c8cc8 Merge pull request #2301 from nicoddemus/merge-master-into-features 
Merge master into features
 2017-03-12 12:32:44 -03:00
Bruno Oliveira
1e0cf5ce4d Merge remote-tracking branch 'upstream/master' into merge-master-into-features 
# Conflicts:
#	AUTHORS
#	CHANGELOG.rst
#	_pytest/pytester.py
 2017-03-10 15:54:05 -03:00
Ronny Pfannschmidt
906b40fbb2 Merge pull request #2289 from fbjorn/fix-trailing-whitespace-in-terminal 
Fix trailing whitespace in terminal output
 2017-03-05 22:45:46 +01:00
fbjorn
cee578e327 Fix trailing whitespace in terminal output 2017-03-05 23:20:55 +03:00
Florian Bruhin
29383d477d Merge pull request #2288 from nodakai/patch-1 
assert.rst: typographical correction
 2017-03-05 18:37:07 +01:00
NODA, Kai
e05ff0338a assert.rst: typographical correction 2017-03-06 01:01:55 +08:00
Floris Bruynooghe
b28749eb92 Merge pull request #2284 from omerhadari/bugfix-unprintable-assertion-errors 
Bugfix unprintable assertion errors
 2017-03-04 15:28:11 +00:00
Ronny Pfannschmidt
07623e78ce Merge pull request #2286 from pytest-dev/disable-py37-travis 
Allow py37-nightly to fail on Travis
 2017-03-04 11:55:07 +01:00
Omer Hadari
dd25ae7f33 added in the correct alphabitcal order 2017-03-04 12:50:02 +02:00
Omer Hadari
02dc545311 added in the correct alphabitcal order 2017-03-04 12:49:00 +02:00
Bruno Oliveira
b61dcded37 Allow py37-nightly to fail on Travis 
Related to #2285
 2017-03-04 07:17:39 -03:00
Omer Hadari
f71467f5b1 added link to changelog 2017-03-04 10:55:59 +02:00
Omer Hadari
6aaf7ae18b added to authors and changelog 2017-03-04 10:32:14 +02:00
Omer Hadari
6a52fe1650 fixed internal error on unprintable raised AssertionErrors 2017-03-04 10:26:46 +02:00
Ronny Pfannschmidt
0c94f517a1 Merge pull request #2236 from KKoukiou/junitxml-change-schema 
Change junitxml.py to produce results that comply with Junitxml schema
 2017-03-02 17:26:11 +01:00
Katerina Koukiou
26e50f1162 junitxml: adjust junitxml output file to comply with JUnit xsd 
Change XML file structure in the manner that failures in call and errors
in teardown in one test will appear under separate testcase elements in
the XML report.
 2017-03-02 15:10:25 +01:00
Bruno Oliveira
5721d8aed1 Merge pull request #2249 from pfhayes/anydbmfix 
Fix importing anydbm within pytest
 2017-03-01 14:41:31 -03:00
Bruno Oliveira
3aac3d0a00 Merge branch 'master' into anydbmfix 2017-03-01 14:41:18 -03:00
Floris Bruynooghe
3e3f20380e Merge pull request #2277 from nicoddemus/yield-fixture-docs-2262 
Improve docs for yield-fixture and with statement a bit
 2017-03-01 11:32:18 -03:00
Bruno Oliveira
bb5f200ed7 Improve docs for yield-fixture and with statement a bit 
Fix #2262
 2017-02-25 12:06:51 -03:00
Bruno Oliveira
0f3d7acdc4 Merge pull request #2266 from asottile/capture_v2 
Make capsys more like stdio streams in python3. Resolves #1407.
 2017-02-24 20:18:55 -03:00
Anthony Sottile
8b598f00e9 Make pytester use pytest's capture implementation 2017-02-23 17:46:28 -08:00
Anthony Sottile
6ba3475448 Make capsys more like stdio streams in python3. Resolves #1407. 2017-02-23 17:46:27 -08:00
Ronny Pfannschmidt
0a89db2739 Merge pull request #2271 from KKoukiou/double-tag 
junitxml: Fix double system-out tags per testcase
 2017-02-22 18:20:17 +01:00
Katerina Koukiou
d3a6be4130 junitxml: Fix double system-out tags per testcase 
In the xml report we now have two occurences for the system-out tag if
the testcase writes to stdout both on call and teardown and fails in
teardown.
This behaviour is against the xsd.
This patch makes sure that the system-out section exists only
once per testcase.
 2017-02-22 16:39:20 +01:00
Bruno Oliveira
6680cb9100 Merge pull request #2264 from asottile/simplify_travis 
Simplify travis.yml with tox environment variables
 2017-02-19 18:07:13 -03:00
Floris Bruynooghe
44ad369c17 Merge pull request #2263 from nicoddemus/revert-pluggy 
Revert subclassing explicitly from object introduced by accident in #2260
 2017-02-19 16:18:38 -03:00
Anthony Sottile
5fd010c4c3 Simplify travis.yml with tox environment variables 2017-02-19 09:02:35 -08:00
Bruno Oliveira
f1900bbea6 Revert subclassing explicitly from object introduced by accident in #2260 2017-02-18 10:34:41 -02:00
Bruno Oliveira
21a09f0895 Merge pull request #2261 from vmuriart/doc-report_header 
Document pytest_report_header and conftest behavior
 2017-02-17 12:22:28 -02:00
Victor Uriarte
a88017cf26 Add note documenting #2257 2017-02-16 23:00:55 -07:00
Victor Uriarte
58d7f4e048 Correct typo 2017-02-16 22:52:06 -07:00
Bruno Oliveira
abd6ad3751 Merge pull request #2260 from MichalTHEDUDE/feature/NewStyleClasses-2147 
New-style classes implemented for python 2.7 - #2147
 2017-02-16 19:05:09 -02:00
Michal Wajszczuk
fb0b90646e New-style classes implemented for python 2.7 - #2147 2017-02-16 20:28:17 +01:00
Bruno Oliveira
9c809f5ad0 Merge pull request #2255 from scop/spelling 
Spelling fixes
 2017-02-15 18:41:49 -02:00
Bruno Oliveira
27f12ed0c3 Merge pull request #2254 from scop/py36-escseq 
Python 3.6 invalid escape sequence deprecation fixes
 2017-02-15 18:41:06 -02:00