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

723 Commits

Author SHA1 Message Date
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
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 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 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 cdd25c9512 bump version to 2.7, depend on py-1.4.29 2015-06-22 23:53:41 +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
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
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
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
Punyashloka Biswal 0c05b906d4 backport fix for #713 2015-06-16 21:27:22 -03:00
holger krekel ca44e88e54 backport fixed issue735 
--HG--
branch : pytest-2.7
 2015-06-04 07:52:25 +02: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 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 9d5182eaad reintroduced _pytest fixture of the pytester plugin which is used 
at least by pytest-xdist.

--HG--
branch : reintroduce_pytest_fixture
 2015-04-22 17:06:00 +02:00
holger krekel 0b361c62c8 Merged in getsourcelines-error-issue-553-pytest2.7 (pull request #273) 
Handle inspect.getsourcelines failures in FixtureLookupError

--HG--
branch : pytest-2.7
 2015-04-17 22:31:55 +02:00
holger krekel e04273df57 fixed regression to 2.6.4 which surfaced e.g. in lost stdout capture printing 
when tests raised SystemExit.

--HG--
branch : systemexit
 2015-04-17 11:47:29 +02:00
Bruno Oliveira 15328c04eb Handle inspect.getsourcelines failures in FixtureLookupError 
Fixes #553

--HG--
branch : getsourcelines-error-issue-553-pytest2.7
 2015-04-15 19:31:22 -03:00
Floris Bruynooghe 6591d7a209 Merged in issue660 (pull request #268) 
fix issue660

--HG--
branch : pytest-2.7
 2015-04-13 00:00:40 +01:00
Floris Bruynooghe 9cae9a2a97 Add wheel support in the changelog 
--HG--
branch : pytest-2.7
 2015-04-12 23:36:43 +01:00
holger krekel 236cac86b1 add me as author of PR 
--HG--
branch : issue660
 2015-04-04 16:36:32 +02:00
holger krekel 79c0515945 merge pytest-2.7 branch 
--HG--
branch : issue660
 2015-04-04 16:35:14 +02:00
holger krekel 0e916460d8 add changelog entries 
--HG--
branch : pytest-2.7
 2015-04-04 16:29:38 +02:00
holger krekel b55d66d0cf - avoid setting of versions and targets in conf.py and Makefile 
as discussed on pytest-dev

- "make help" now prints pytest specific information.

- add a "_getdoctarget.py" helper

- make ``setup.py`` read the version from ``_pytest/__init__.py``

--HG--
branch : release-checklist
 2015-04-02 10:38:25 +02:00
holger krekel 3ed3e51997 fix issue660: properly report fixture scope mismatches independent 
from fixture argument ordering.

--HG--
branch : issue660
 2015-04-01 18:42:48 +02:00
holger krekel e16983d265 bump versions to dev, including changing the doc-install target to "dev" 
instead of "latest"
 2015-03-26 13:48:59 +01:00
holger krekel d2a8866bce bump verrsion to python2.7, fix a too precise test for windows, regen docs 2015-03-26 09:34:10 +01:00
Anatoly Bubenkov d94a29e866 merge almarklein/default 2015-03-23 21:25:10 +01:00
Anatoly Bubenkov ce95437dee merge with default 
--HG--
branch : issue463
 2015-03-23 20:41:27 +01:00
Brianna Laugher 3ba3112a85 update changelog 
--HG--
branch : issue463
 2015-03-23 20:28:04 +01:00
holger krekel f3580bee2d fix issue435: make reload() work when assert rewriting is active. 
Thanks Daniel Hahler.
 2015-03-23 10:08:47 +01:00
Almar Klein 0fc75c9622 Storing sys.last_traceback: test, docs and changelog 2015-03-21 17:06:24 +01:00
Anatoly Bubenkov 060609317a allow to override parametrized fixtures with non-parametrized ones and vice versa 
--HG--
branch : parametrized-fixture-override
 2015-03-01 13:54:43 +01:00
Ronny Pfannschmidt 1e6e373913 Merged in issue616 (pull request #252) 
fix issue616 - conftest visibility fixes.
 2015-02-28 10:02:58 +01:00
holger krekel 019dc14fc4 fix typos, clarify git/hg 
--HG--
branch : docs_community
 2015-02-27 13:38:45 +01:00
holger krekel f6df3b0b97 added documentationo on the new pytest-dev teams on bitbucket and 
github.  See https://pytest.org/latest/contributing.html (tentative)
Thanks to Anatoly for pushing and initial work on this.

--HG--
branch : docs_community
 2015-02-27 11:54:17 +01:00
holger krekel 8ed5b77aba fix issue650: introduce new --doctest-ignore-import-errors option courtesy 
of Charles Cloud.
 2015-02-26 22:02:49 +01:00
holger krekel d73e689991 fix issue616 - conftest visibility fixes. This is achieved by 
refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.

--HG--
branch : issue616
 2015-02-26 21:56:44 +01:00
Ronny Pfannschmidt 3d0b756877 merge in the 2.6 maintenance branch 2015-02-22 11:45:07 +01:00
Dave Hunt d1adbf4a5c Added documentation for PYTEST_ADDOPTS environment variable, updated CHANGELOG and AUTHORS. 
--HG--
branch : env-addopts
 2015-02-09 14:11:54 +00:00
Ronny Pfannschmidt 5941b2e071 fix issue 655: crude workarounds around python2/3 exception leaks 2015-01-09 19:55:49 +01:00
Floris Bruynooghe e4bb48995a Mention fix for issue 615 in changelog 
Fixes issue 615.
 2014-10-28 13:31:09 +00:00
holger krekel d0d4759c96 fix changelog -- we should have all changes in trunk that are in 2.6.4 2014-10-24 17:19:54 +02:00
holger krekel 60cdb875ed backport pastebin fix 
--HG--
branch : pytest-2.6
 2014-10-24 15:24:44 +02:00
holger krekel 0834b63560 backport fixed issue620 (doc for genscript) 
--HG--
branch : pytest-2.6
 2014-10-24 13:53:39 +02:00