jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
test_ok1/_pytest
History
Bruno Oliveira f3b359f5b8 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 
# Conflicts:
#	_pytest/capture.py
#	_pytest/compat.py
#	_pytest/python.py
#	testing/python/collect.py
#	testing/test_mark.py
 		2017-05-03 19:04:53 -03:00
..
_code Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-05-03 19:04:53 -03:00
assertion Merge pull request #2315 from RonnyPfannschmidt/namespace-hook 2017-04-21 16:24:20 -03:00
vendored_packages Revert subclassing explicitly from object introduced by accident in #2260 2017-02-18 10:34:41 -02:00
__init__.py fix import error 2017-04-26 15:57:55 +02:00
_argcomplete.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
_pluggy.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
cacheprovider.py Changed behavior if --lf and --ff are both used. 2017-04-10 17:46:13 +09:00
capture.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
compat.py Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-05-03 19:04:53 -03:00
config.py Merge pull request #2315 from RonnyPfannschmidt/namespace-hook 2017-04-21 16:24:20 -03:00
debugging.py fix all singular internal module imports and add a test for them 2017-03-28 11:45:06 +02:00
deprecated.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
doctest.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
fixtures.py Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-05-03 19:04:53 -03:00
freeze_support.py remove pytest_namespace from _pytest.freeze_support 2017-03-28 11:45:06 +02:00
helpconfig.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
hookspec.py add a note about the deprecation of the pytest_namespace hook 2017-03-28 11:45:06 +02:00
impl - enhance ordering of tests using parametrized resources 2012-08-01 09:07:32 +02:00
junitxml.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
main.py Merge pull request #2315 from RonnyPfannschmidt/namespace-hook 2017-04-21 16:24:20 -03:00
mark.py remove the namespace hook from mark after the param feature merge 2017-03-28 11:45:06 +02:00
monkeypatch.py fix all singular internal module imports and add a test for them 2017-03-28 11:45:06 +02:00
nose.py fixup nose/pytest plugins 2017-03-28 11:45:06 +02:00
pastebin.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
pytester.py Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-05-03 19:04:53 -03:00
python.py Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-05-03 19:04:53 -03:00
recwarn.py fix up oversights 2017-03-28 11:45:06 +02:00
resultlog.py Replace py.builtin.print_() calls by builtin print() function 2017-03-16 22:46:51 -03:00
runner.py fix all singular internal module imports and add a test for them 2017-03-28 11:45:06 +02:00
setuponly.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
setupplan.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
skipping.py fix up oversights 2017-03-28 11:45:06 +02:00
terminal.py Improve item.warn handling of fslocation parameter 2017-04-13 19:01:14 -03:00
tmpdir.py Add __future__ imports to all pytest modules 2017-03-16 22:45:40 -03:00
unittest.py fixup nose/pytest plugins 2017-03-28 11:45:06 +02:00
warnings.py Avoid displaying the same warning multiple times for an item 2017-03-20 20:40:53 -03:00