0998170a01
check webhook again
2015-06-23 17:22:37 +02:00
28cf4c3226
small fix to test webhook
2015-06-23 17:14:08 +02:00
08613b621e
Merge pull request #799 from pytest-dev/noconftest
...
Add a --noconftest option.
2015-06-23 16:53:22 +02:00
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
e84c00efae
finish pytest-2.7.2 release
2015-06-23 16:31:24 +02:00
f78b6df8bc
Return an empty list directly.
2015-06-23 14:05:44 +02:00
53021ea264
Merge pull request #800 from pytest-dev/confcutdir-test-fix
...
Check conftest.py is not loaded with --confcutdir.
2015-06-23 10:57:33 +02:00
01d067ec2b
Check conftest.py is not loaded with --confcutdir.
...
The test creates a conftest.py with "assert 0" which never should be loaded.
However, if it were loaded, the test would still pass as it never checks if it
was loaded or not.
See #799 .
2015-06-23 10:12:30 +02:00
8e0589af69
Add changelog entry.
2015-06-23 09:47:07 +02:00
8664fc4102
Add a --noconftest option.
2015-06-23 09:38:54 +02:00
755d7b3787
Merge pull request #798 from radarhere/patch-1
...
Fixed typo
2015-06-23 09:00:42 +02:00
cba1ca6244
Fixed typo
2015-06-23 10:29:37 +10:00
cdd25c9512
bump version to 2.7, depend on py-1.4.29
2015-06-22 23:53:41 +02:00
898b63b665
change spelling, thanks Maciej Maciaszek
2015-06-22 11:34:00 +02:00
e947732bde
Merge pull request #791 from pytest-dev/coverage-config
...
Improve coverage score by tweaking options
2015-06-21 00:54:25 +02:00
b0491e1a5e
Merge pull request #792 from iKevinY/svg-badges
...
Use SVGs for all README badges
2015-06-20 16:10:55 -03:00
190326c186
Use SVGs for all README badges
2015-06-20 10:58:38 -07:00
0008bcb877
Add coveragerc file for coverage options
2015-06-20 00:58:41 -03:00
080dfb9841
Merge pull request #788 from pytest-dev/issue-767
...
Fix issue where pytest.raises() doesn't always return Exception instance in py26
2015-06-19 13:41:44 +02:00
02421790bf
Merge pull request #786 from edisongustavo/pytest-2.7
...
Fix Python2 bug with PrettyPrinter raising with sets of unsortable elements
2015-06-19 08:39:15 -03:00
48d91def7e
Added workaround to still show the diff on containers with unsortable elements.
...
fix issue #718
2015-06-19 07:51:59 -03:00
eb73db56c7
Fix issue where pytest.raises() doesn't always return Exception instance in py26
...
Fixes #767
2015-06-19 07:46:47 -03:00
80b5ebc398
Merge pull request #790 from pytest-dev/irc-notifications
...
Adjust IRC notifications to use #pytest.
2015-06-19 07:31:50 -03:00
94332ed1d8
Adjust IRC notifications to use #pytest.
...
It seems #pytest-dev is quite dead. Also I set it to only send notifications on
changes (i.e. success -> failure and vice-versa).
2015-06-19 11:37:10 +02:00
13c01193d6
Merge remote-tracking branch 'origin/pytest-2.7'
2015-06-19 10:03:37 +02:00
26f590babe
Merge pull request #789 from pytest-dev/issue-114
...
Skip reports refer to pytest code instead of original test functions
2015-06-19 10:02:58 +02:00
f90b2f845c
unittest.SkipTest now reports original function location
...
Fix #748
2015-06-18 22:27:43 -03:00
9d4e0365da
Skipif marker report now refers to the skipped function
...
Fix #114
2015-06-18 21:59:44 -03:00
4d6fef36f4
Merge branch 'pytest-2.7'
2015-06-17 13:42:41 +02:00
0431b8bb74
Merge pull request #784 from pytest-dev/create-dirs-xml-log
...
Automatically create directories for junit-xml and resultlog
2015-06-17 13:28:07 +02:00
2653024409
Use os.path.isdir instead of os.path.exists
...
As suggested during review
2015-06-17 08:08:03 -03:00
923174718e
Allow failure of py27-subprocess tox-env while on pytest-2.7
...
"inprocess by default" was introduced in 2.8, and the current travis
configuration was backported from master so this specific
tox-env will remain disabled while pytest-2.7 maintenance branch
lasts.
2015-06-17 00:53:38 -03:00
73f37d0989
split travis jobs
...
Conflicts:
README.rst
2015-06-17 00:22:34 -03:00
0722b95e53
use travis containers
2015-06-17 00:21:32 -03:00
ae89436d97
Remove duplicated author from AUTHORS
2015-06-17 00:05:56 -03:00
af77a23501
Add docs for new tests
2015-06-17 00:04:25 -03:00
2a1424e563
Merge branch 'pytest-2.7' of github.com:curzona/pytest into pytest-2.7
...
Conflicts:
AUTHORS
CHANGELOG
2015-06-17 00:02:26 -03:00
1871d526ac
Update CHANGELOG and AUTHORS
2015-06-16 19:33:26 -07:00
9346e18d8c
Test creating directory for junit-xml and resultlog
2015-06-16 19:30:43 -07:00
1db5c95414
Automatically create directory for results
2015-06-16 19:30:19 -07:00
0c05b906d4
backport fix for #713
2015-06-16 21:27:22 -03:00
f04e01f55f
Sort AUTHORS names
2015-06-16 21:20:43 -03:00
a0da7b9774
Mention issue 713 in the test's docstring
2015-06-16 20:42:49 -03:00
0b0406fa85
Handle reports that don't have a reprcrash
...
Closes #713 (which happens because ReprFailDoctest
doesn't have a reprcrash)
2015-06-16 18:53:20 -04:00
f1245b094f
Merge pull request #779 from pytest-dev/coveralls-shields-badge
...
Use shields.io badge for coveralls
2015-06-16 04:09:49 +02:00
c840e5c06e
Use shields.io badge for coveralls
...
All badges have a similar look
2015-06-15 23:08:17 -03:00
c7573a92b2
Merge pull request #778 from pytest-dev/pypi-badge
...
Use pypi version badge from shields.io
2015-06-16 04:05:30 +02:00
84a476af87
Use pypi version badge from shields.io
...
The old one from pypip.in seems to always be broken as of late
2015-06-15 23:03:53 -03:00
e890d60459
appveyor badge
2015-06-16 03:28:12 +02:00
5dbe565b6d
Merge branch 'master' of github.com:pytest-dev/pytest
2015-06-16 03:25:39 +02:00
holger krekel
holger krekel (rather uses bitbucket/hpk42)
Florian Bruhin
Andrew Murray
Anatoly Bubenkov
Bruno Oliveira
Kevin Yap
Edison Gustavo Muenz
curzona
Punyashloka Biswal