floraachy/pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,347 Commits 32 Branches 205 Tags
3497aa0766ac6f2f2cd66cc483c86f2a67a738aa
Commit Graph

792 Commits

Author SHA1 Message Date
Florian Bruhin
03d8a6c05d Update CHANGELOG. 2015-08-07 23:08:22 +02:00
Florian Bruhin
91a29932a6 Add CHANGELOG entry. 2015-08-07 07:58:13 +02:00
Bruno Oliveira
4f83586f55 Give credit where it is due in CHANGELOG 😄 
Related to #890
 2015-08-06 22:51:32 -03:00
Abhijeet Kasurde
ab9befb197 Updated CHANGELOG and AUTHORS 2015-08-05 15:21:37 +05:30
Eric Hunsberger
52b4eb6c46 Added warns to assert warnings are thrown 
Works in a similar manner to `raises`, but for warnings instead
of exceptions. Also refactored `recwarn.py` so that all the
warning recording and checking use the same core code.
 2015-07-30 23:28:32 -04:00
Floris Bruynooghe
e69e785b23 Mention fix for issue #683 2015-07-26 12:15:29 +02:00
Floris Bruynooghe
011565ca10 Add changelog entry for capture improvement 2015-07-26 11:42:33 +02:00
Floris Bruynooghe
f64d5f1209 Merge pull request #884 from cpommranz/deprecate_genscript 
Deprecate and warn about --genscript, fixes #730
 2015-07-25 19:09:52 +02:00
Floris Bruynooghe
251fc68ef9 Merge fix for #751 
Merge branch 'fix-751' of github.com:JanBednarik/pytest into jb-fix-751
 2015-07-25 19:03:44 +02:00
Jan Bednařík
0b92650494 Update changelog. 2015-07-25 16:25:29 +02:00
Christian Pommranz
00e1a2122a Deprecate and warn about --genscript, fixes #730 2015-07-25 15:10:22 +02:00
Floris Bruynooghe
023687d8d0 Merge pull request #872 from nicoddemus/confcutdir-inifile 
Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini by default
 2015-07-25 14:03:24 +02:00
Bruno Oliveira
9f94e443ff Merge remote-tracking branch 'upstream/pytest-2.7' 
Conflicts:
	testing/conftest.py
 2015-07-24 19:24:21 -03:00
Bruno Oliveira
91e8e59cea Merge pull request #860 from nicoddemus/warn-plugins-as-str-main 
Make passing plugins as str objects a more obvious failure
 2015-07-24 19:13:39 -03:00
Eric Hunsberger
d104487282 importorskip: Allow non-integer version strings 
Use `pkg_resources.parse_version` to parse version strings.
This can handle 'dev', 'rc', alpha and beta version strings,
among others.
 2015-07-24 12:34:06 -04:00
Bruno Oliveira
35bbcc39a2 Interpret strings to "plugins" arg in pytest.main() as module names 
See #855
 2015-07-23 23:37:09 -03:00
Bruno Oliveira
ab9e246ab0 Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default 
As discussed in #82
 2015-07-23 23:21:07 -03:00
Bruno Oliveira
df29120abe Merge branch 'pytest-2.7' 
Conflicts:
	_pytest/config.py
	_pytest/genscript.py
	_pytest/mark.py
	tox.ini
 2015-07-23 22:35:51 -03:00
Bruno Oliveira
ce96973ed5 Merge pull request #864 from pytest-dev/consider-color-yes-everywhere 
Consider --color option in more places which deal with TerminalWriters
 2015-07-23 08:03:52 -03:00
Bruno Oliveira
77844ec5f3 Fixed typo in CHANGELOG: "testdirs" -> "testpaths" 2015-07-22 12:14:49 -03:00
Floris Bruynooghe
0e26de2218 Merge pull request #867 from nicoddemus/autouse-yield-fixture-class 
Fix autouse fixtures defined in a TestCase subclass
 2015-07-22 01:25:21 +02:00
Bruno Oliveira
31cfbac1f4 Fix autouse fixtures defined in a TestCase subclass 2015-07-20 19:28:54 -03:00
Anatoly Bubenkov
6af7172204 Merge branch 'pytest-2.7' 2015-07-19 15:25:04 +02:00
Bruno Oliveira
953916df49 Report correct reason when using multiple skip/xfail markers 2015-07-18 18:18:45 -03:00
Bruno Oliveira
2f7d0f8bd9 Consider --color option in more places which deal with TerminalWriters 2015-07-18 16:39:55 -03:00
Matthias Bussonnier
b18e6439bd Ast Call signature changed on 3.5 
fix issue 744 on bitbucket

port of merge request 296

https://bitbucket.org/pytest-dev/pytest/pull-request/296/astcall-signature-changed-on-35
https://bitbucket.org/pytest-dev/pytest/issue/744/

Conflicts:
	CHANGELOG
 2015-07-18 13:15:46 -03:00
Floris Bruynooghe
5e0235946b Merge pull request #801 from Carreau/test-35 
Support Python 3.5
 2015-07-18 11:30:36 +01:00
Bruno Oliveira
330de0a93d Use a subdirectory in the TEMP directory to speed up tmpdir creation 
Fix #105
 2015-07-16 19:50:49 -03:00
Bruno Oliveira
aa25fb05a9 Make sure marks in subclasses don't change marks in superclasses 
Fix #842
 2015-07-16 19:29:16 -03:00
Bruno Oliveira
0f52856f99 Use a subdirectory in the TEMP directory to speed up tmpdir creation 
Fix #105
 2015-07-15 20:03:58 -03:00
Matthias Bussonnier
26e64fc45c Ast Call signature changed on 3.5 
fix issue 744 on bitbucket

port of merge request 296

https://bitbucket.org/pytest-dev/pytest/pull-request/296/astcall-signature-changed-on-35
https://bitbucket.org/pytest-dev/pytest/issue/744/
 2015-07-15 13:49:40 -07:00
Bruno Oliveira
d6033037ac Consider session fixtures for doctest docstrings in modules 
Fixes #768
 2015-07-13 12:29:09 -03:00
Bruno Oliveira
5750ae784a Reword CHANGELOG a bit 2015-07-13 12:01:54 -03:00
Bruno Oliveira
5ec2a17f08 --fixtures only shows fixtures from first file 
Fix #833
 2015-07-12 17:32:39 -03:00
Bruno Oliveira
7445c5bd70 Add support for PEP302 get_data API 
Fix #808
 2015-07-11 14:13:43 -03:00
Bruno Oliveira
1baa1a4d01 Merge pull request #822 from nicoddemus/extra-usage-info 
Print inifile and rootdir when there's usage errors
 2015-07-11 13:43:20 -03:00
Bruno Oliveira
8a6aa5e17e Print inifile and rootdir when there's usage errors 
Related to #821
 2015-07-10 21:56:12 -03:00
Bruno Oliveira
854e603f84 Add new testdirs ini option 
Fix #694
 2015-07-10 21:52:47 -03:00
Bruno Oliveira
d773c7498f Reword entry in the changelog to show case the new status bar colors better 2015-07-03 18:36:15 -03:00
Bruno Oliveira
4ef6cdfb68 Add small thanks note to Eric Siegerman 2015-07-03 18:31:15 -03:00
Bruno Oliveira
d10054a38d Merge branch 'esiegerman/summary_colors' of github.com:esiegerman/pytest 2015-07-03 18:29:17 -03:00
Kevin Cox
7fa27af408 Add file and line attributes to junit-xml output. 
This adds the `file` and `line` attributes to the junit-xml output
which can be used by tooling to identify where tests come from. This can be
used for many things such as IDEs jumping to failures and test
runners evenly balancing tests among multiple executors.

Update test_junitxml.py

Foo.
 2015-07-02 18:41:52 -04:00
Eric Siegerman
2c419c4790 Add CHANGELOG and AUTHORS entries 2015-07-02 15:47:03 -04:00
Bruno Oliveira
27a98788a8 start 2.7.3 CHANGELOG 2015-06-26 00:30:26 -03:00
Pieter Mulder
75679f08c9 Update AUTHORS and CHANGELOG 2015-06-25 17:38:45 +02:00
holger krekel (rather uses bitbucket/hpk42)
08613b621e Merge pull request #799 from pytest-dev/noconftest 
Add a --noconftest option.
 2015-06-23 16:53:22 +02:00
holger krekel
ee40ea5f6d Merge branch 'pytest-2.7' 
Conflicts:
	AUTHORS
	_pytest/__init__.py
	setup.py
	testing/conftest.py
	tox.ini
 2015-06-23 16:49:05 +02:00
Florian Bruhin
8e0589af69 Add changelog entry. 2015-06-23 09:47:07 +02:00
Andrew Murray
cba1ca6244 Fixed typo 2015-06-23 10:29:37 +10:00
holger krekel
cdd25c9512 bump version to 2.7, depend on py-1.4.29 2015-06-22 23:53:41 +02:00