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

4310 Commits

Author SHA1 Message Date
Brianna Laugher 985fd0cc2b Mention Contributors team by name in CONTRIBUTING 2015-07-26 12:07:50 +02:00
Floris Bruynooghe 97e5f7d7e9 Merge merge branch 
I suspect I don't yet know how to use git...  Surely I don't need two
merges to merge a contribution.
 2015-07-26 11:49:42 +02:00
Floris Bruynooghe 011565ca10 Add changelog entry for capture improvement 2015-07-26 11:42:33 +02:00
Floris Bruynooghe e68fa641ff Merge reset-capgture-on-reeadouterr-errors 
Merge branch 'reset-capture-on-readouterr-errors' of github.com:davidszotten/pytest into merge-capmerge
 2015-07-26 11:39:03 +02:00
David Szotten 3e6bee2fc6 fail if snap is removed in the future 2015-07-26 01:28:00 +02:00
David Szotten 983d249680 reset capture even if readouterr throws 
otherwise that exception (and all following output) end up in /dev/null
 2015-07-26 01:15:51 +02:00
Floris Bruynooghe 8338c692a3 Merge pull request #887 from maartenq/753content_of 
changed contents -> content but still #753 did not solved, might be i…
 2015-07-25 19:11:53 +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 f38c632635 Merge branch 'jb-fix-751' 2015-07-25 19:04:59 +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
Maarten df8a83b2a1 changed contents -> content but still #753 did not solved, might be issues with regendoc 2015-07-25 17:48:12 +02:00
Jan Bednařík 0b92650494 Update changelog. 2015-07-25 16:25:29 +02:00
Jan Bednařík 9906a19e29 Issue #751 - fix. 2015-07-25 15:38:27 +02:00
Jan Bednařík f78d87ee38 Issue #751 - test. 2015-07-25 15:38:11 +02:00
Christian Pommranz 00e1a2122a Deprecate and warn about --genscript, fixes #730 2015-07-25 15:10:22 +02:00
Floris Bruynooghe 80ee620459 Merge pull request #881 from maartenq/master 
setuptools not present issue deprecating gentest
 2015-07-25 15:03:50 +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
Maarten e3d60024aa setuptools not present issue deprecating gentest 2015-07-25 13:50:40 +02:00
Bruno Oliveira ae28e4ba0f Merge remote-tracking branch 'upstream/pytest-2.7' 
Conflicts:
	.travis.yml
 2015-07-24 20:02:12 -03:00
Bruno Oliveira 92c61b0de3 Merge pull request #876 from takluyver/travis-reenable-35-pt27 
Re-enable Python 3.5 testing on Travis
 2015-07-24 19:59:43 -03:00
Thomas Kluyver ed2c06c8cd Re-enable Python 3.5 testing on Travis 
This is PR #875, but reissued against the pytest-2.7 branch.

According to the docs, it looks like this should work:
http://docs.travis-ci.com/user/languages/python/

I've explicitly specified beta 3, so it will need updating when future
betas come out. You could instead specify '3.5-dev', which would give
less need to update, but then it's less clear whether a change in status
is due to a change in pytest or in Python itself.
 2015-07-24 15:50:45 -07:00
Bruno Oliveira 033def0a7a Workaround for cmdexec bug on Windows 
This bug fails the entire pytest suite when executed with the
--lsof option in Python 2 on Windows.
 2015-07-24 19:24:31 -03: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
Bruno Oliveira 4f1ae8c45e Workaround for cmdexec bug on Windows 
This bug fails the entire pytest suite when executed with the
--lsof option in Python 2 on Windows.
 2015-07-24 18:05:30 -03:00
Bruno Oliveira b84fcbc85e Merge pull request #873 from hunse/fix-dev-versions 
Allow non-integer version strings in `importorskip`
 2015-07-24 16:08:15 -03:00
Eric Hunsberger 3cd19a7e45 Use monkeypatch for setting modules in tests 
Instead of directly setting `sys.modules`. This ensures that they
get removed at the end of the test.
 2015-07-24 12:34:06 -04: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 5a17e797c7 Fix basepython for tox envs "doctesting" and "coveralls" 
Because we are currently using "nighly" python for travis, which
uses python 3.6 as the default interpreter. This breaks the environments
listed above because "inspect.getargspec" has been removed in py36.
 2015-07-23 21:15:45 -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 81f18f8a0f Fix flakes 2015-07-21 19:55:01 -03:00
Bruno Oliveira 0769bb4898 Make pastebin use _pytest.config.create_terminal_writer 2015-07-21 12:55:18 -03:00
Bruno Oliveira 31cfbac1f4 Fix autouse fixtures defined in a TestCase subclass 2015-07-20 19:28:54 -03:00
Anatoly Bubenkov 045274e647 remove merge artifact 2015-07-19 15:49:43 +02:00
Anatoly Bubenkov 6af7172204 Merge branch 'pytest-2.7' 2015-07-19 15:25:04 +02:00
Anatoly Bubenkov 412b43b216 Merge pull request #865 from nicoddemus/skipif-reason-multiple 
Report correct reason when using multiple skip/xfail markers
 2015-07-19 15:14:47 +02:00
Bruno Oliveira de65737cb1 Fix flakes 2015-07-18 18:23:17 -03: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
Bruno Oliveira 23aaa8a62c Allow py35 to fail on Travis until it is properly supported (fix2) 
Conflicts:
	.travis.yml
 2015-07-18 15:39:22 -03:00
Bruno Oliveira 604a39f5ef Allow py35 to fail on Travis until it is properly supported (fix2) 2015-07-18 15:30:16 -03:00
Bruno Oliveira a5bc98136d Allow py35 to fail on Travis until it is properly supported (fix) 2015-07-18 15:18:57 -03:00
Bruno Oliveira 7dab2e1efe Allow py35 to fail on Travis until it is properly supported 2015-07-18 14:46:36 -03:00
Bruno Oliveira da1d5712cf Fix broken links 
Fix #857
 2015-07-18 14:15:07 -03:00
Bruno Oliveira 30ff723d57 Merge pull request #859 from pytest-dev/py35fix-port 
Py35fix port
 2015-07-18 13:53:11 -03:00