jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,020 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

4020 Commits

Author SHA1 Message Date
Bruno Oliveira 5ec2a17f08 --fixtures only shows fixtures from first file 
Fix #833
 2015-07-12 17:32:39 -03:00
Bruno Oliveira 27a98788a8 start 2.7.3 CHANGELOG 2015-06-26 00:30:26 -03:00
Bruno Oliveira 9fb1637ce2 Test that deprecated_call keeps internal warnings structures intact 2015-06-26 00:26:59 -03:00
Pieter Mulder 75679f08c9 Update AUTHORS and CHANGELOG 2015-06-25 17:38:45 +02:00
Pieter Mulder 444cdfe6e3 Correct test_deprecated_call_preserves test. 
Test if we preserve the correct functions.
 2015-06-25 17:33:40 +02:00
Pieter Mulder 89b00d714f deprecated_call dit not revert functions back to original 
Make sure that the warnings.warn and warnings.warn_explicit are reverted
to there original function after running the function in deprecated_call
 2015-06-25 17:11:50 +02:00
holger krekel e84c00efae finish pytest-2.7.2 release 2015-06-23 16:31:24 +02:00
holger krekel (rather uses bitbucket/hpk42) 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
Florian Bruhin 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
holger krekel cdd25c9512 bump version to 2.7, depend on py-1.4.29 2015-06-22 23:53:41 +02:00
holger krekel 898b63b665 change spelling, thanks Maciej Maciaszek 2015-06-22 11:34:00 +02:00
holger krekel (rather uses bitbucket/hpk42) 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
Bruno Oliveira 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
Edison Gustavo Muenz 48d91def7e Added workaround to still show the diff on containers with unsortable elements. 
fix issue #718
 2015-06-19 07:51:59 -03:00
Bruno Oliveira eb73db56c7 Fix issue where pytest.raises() doesn't always return Exception instance in py26 
Fixes #767
 2015-06-19 07:46:47 -03:00
holger krekel (rather uses bitbucket/hpk42) 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
Bruno Oliveira f90b2f845c unittest.SkipTest now reports original function location 
Fix #748
 2015-06-18 22:27:43 -03:00
Bruno Oliveira 9d4e0365da Skipif marker report now refers to the skipped function 
Fix #114
 2015-06-18 21:59:44 -03:00
Anatoly Bubenkov 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
Bruno Oliveira 2653024409 Use os.path.isdir instead of os.path.exists 
As suggested during review
 2015-06-17 08:08:03 -03:00
Bruno Oliveira 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
Anatoly Bubenkov 73f37d0989 split travis jobs 
Conflicts:
	README.rst
 2015-06-17 00:22:34 -03:00
Anatoly Bubenkov 0722b95e53 use travis containers 2015-06-17 00:21:32 -03:00
Bruno Oliveira ae89436d97 Remove duplicated author from AUTHORS 2015-06-17 00:05:56 -03:00
Bruno Oliveira af77a23501 Add docs for new tests 2015-06-17 00:04:25 -03:00
Bruno Oliveira 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
curzona 1871d526ac Update CHANGELOG and AUTHORS 2015-06-16 19:33:26 -07:00
curzona 9346e18d8c Test creating directory for junit-xml and resultlog 2015-06-16 19:30:43 -07:00
curzona 1db5c95414 Automatically create directory for results 2015-06-16 19:30:19 -07:00
Punyashloka Biswal 0c05b906d4 backport fix for #713 2015-06-16 21:27:22 -03:00
Bruno Oliveira f04e01f55f Sort AUTHORS names 2015-06-16 21:20:43 -03:00
holger krekel ca44e88e54 backport fixed issue735 
--HG--
branch : pytest-2.7
 2015-06-04 07:52:25 +02:00
holger krekel b5fd3cfb84 fix typo 
--HG--
branch : pytest-2.7
 2015-06-03 23:42:38 +02:00
holger krekel dc727832a0 Close branch pytest-2.7 
--HG--
branch : pytest-2.7
 2015-06-03 23:34:38 +02:00
Floris Bruynooghe bf837164b4 Add how to upload a wheel and tag the release 
--HG--
branch : pytest-2.7
 2015-05-19 09:32:21 +01:00
Floris Bruynooghe f6d589caa1 Added tag 2.7.1 for changeset edc1d080bab5 
--HG--
branch : pytest-2.7
 2015-05-19 09:26:59 +01:00
Floris Bruynooghe 738c8762df Regenerate docs using 2.7.1 
--HG--
branch : pytest-2.7
 2015-05-19 01:54:24 +01:00
Floris Bruynooghe 3d990a6237 Fix rest formatting and set final version number 
--HG--
branch : pytest-2.7
 2015-05-19 01:53:06 +01:00
Floris Bruynooghe b024dbe794 Remove unused link 
--HG--
branch : pytest-2.7
 2015-05-19 01:52:33 +01:00
Floris Bruynooghe 83a93e5e9a More updates/fixes to release process 
Some of this is temporary, but this is how I got things to work.

--HG--
branch : pytest-2.7
 2015-05-19 01:52:06 +01:00
Floris Bruynooghe 504b6b72a9 Set 2.7.1 version number 
--HG--
branch : pytest-2.7
 2015-05-19 01:50:32 +01:00
holger krekel 45851644c1 remove adopt message 
--HG--
branch : pytest-2.7
 2015-05-12 13:34:32 +02:00
Eric Siegerman 5a06330f61 Doc typo 
--HG--
branch : pytest-2.7
 2015-05-01 11:18:17 -04:00
Floris Bruynooghe 11ad61ba07 Use current regendocs location 
--HG--
branch : pytest-2.7
 2015-05-01 00:27:47 +01:00
Floris Bruynooghe 129549fd5b Some more tweaks of how to release 
--HG--
branch : pytest-2.7
 2015-05-01 00:27:04 +01:00
Floris Bruynooghe 652a353319 Some small corrections to release process 
--HG--
branch : pytest-2.7
 2015-04-30 22:55:01 +01:00
Floris Bruynooghe d6d8d5b9d1 Prepare docs for bugfix release 
--HG--
branch : pytest-2.7
 2015-04-30 22:54:43 +01:00
Floris Bruynooghe 7f554f50e3 Fix collapse false to look at unescaped braces only 
Sometimes the repr of an object can contain the "\n{" sequence which is
used as a formatting language, so they are escaped to "\\n{".  But the
collapse-false code needs to look for the real "\n{" token instead of
simply "{" as otherwise it may get unbalanced braces from the object's
repr (sometimes caused by the collapsing of long reprs by saferepr).

Fixes issue #731.

--HG--
branch : pytest-2.7
 2015-04-30 02:31:12 +01:00
holger krekel e94f5727c4 Merged in contributing-fix (pull request #281) 
Remove duplicated step in CONTRIBUTING

--HG--
branch : pytest-2.7
 2015-04-26 01:05:50 +02:00
holger krekel 35da487d46 Close branch contributing-fix 
--HG--
branch : contributing-fix
 2015-04-26 01:05:50 +02:00