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

209 Commits

Author SHA1 Message Date
Bruno Oliveira ab86dea529 Support [tool:pytest] in setup.cfg files 
Also deprecate [pytest] usage in setup.cfg files

Fix #567
 2016-08-17 08:19:38 -03:00
Bruno Oliveira 802755ceed Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2016-08-06 17:58:17 -03:00
Daniel Hahler a2891420de Fix determining rootdir from common_ancestor 2016-08-06 19:35:40 +02:00
Floris Bruynooghe 510a6083ba Merge pull request #1758 from nicoddemus/deprecated-module 
Add deprecation module to centralize deprecation messages and bits of…
 2016-07-28 22:36:55 +01:00
Bruno Oliveira 6c8b0a28e1 Add deprecation module to centralize deprecation messages and bits of code 2016-07-25 18:14:39 -03:00
Roberto Polli ab6aef1d1f feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths. 2016-07-25 12:41:58 +02:00
Bruno Oliveira e0f08a73ab Merge branch 'features' into conftest-exception-printing 2016-07-20 19:33:36 -03:00
Ronny Pfannschmidt 61cc5c4d4e argument parsing: always warn for string types 
fix #1741
 2016-07-19 10:33:25 +02:00
Ronny Pfannschmidt 317b3f257d optparse compatibility - add float and complex 
also documents the implementation quality
fixes #457
 2016-07-19 10:20:41 +02:00
Floris Bruynooghe d1852a48b7 Remove assertion reinterpretation 
The assertion reinterpretation is an old backwards compatibility
mode which was no longer being maintained on feature-parity with
the assertion rewriting mode.  It was also responsible for some
dubious patching of builtins and test with side-effects would
suddenly start passing.  Since re-writing has been the default for
a long time and plugins are now also re-written it is time to
retire reinterpretation.
 2016-07-15 00:33:39 +01:00
Floris Bruynooghe 24fbbbef1f Merge pull request #1641 from flub/rewrite-plugins 
Rewrite plugins
 2016-07-14 19:39:15 +01:00
Floris Bruynooghe 51ee7f8734 Fixup things after rebase 
Some changes to make things work on top of current features branch.
 2016-07-14 12:42:29 +01:00
Bruno Oliveira ab0b6faa5f Deprecate support for passing command-line as string to pytest.main() 
Fixes #1723
 2016-07-14 08:11:43 -03:00
Floris Bruynooghe 743f59afb2 Introduce pytest.register_assert_rewrite() 
Plugins can now explicitly mark modules to be re-written.  By default
only the modules containing the plugin entrypoint are re-written.
 2016-07-13 17:31:09 +01:00
Floris Bruynooghe a98e3cefc5 Enable re-writing of setuptools-installed plugins 
Hook up the PEP 302 import hook very early in pytest startup so
that it gets installed before setuptools-installed plugins are
imported.  Also iterate over all installed plugins and mark them
for rewriting.  If an installed plugin is already imported then
a warning is issued, we can not break since that might break
existing plugins and the fallback will still be gracefull to
plain asserts.

Some existing tests are failing in this commit because of the new
warning triggered by inline pytest runs due to the hypothesis
plugin already being imported.  The tests will be fixed in the next
commit.
 2016-07-13 17:29:19 +01:00
Ronny Pfannschmidt 8c49561470 split most fixture related code into own plugin 2016-07-09 20:36:00 +02:00
Ronny Pfannschmidt b9a91dc112 merge from master to features 2016-07-06 11:51:48 +02:00
Javier Domingo Cansino 61e605f60b Making conftest import failures easier to debug 2016-07-05 10:04:42 +01:00
RedBeardCode 1b0dbd8c40 Move the freezing function from genscript.py to a new module freeze_support.py 2016-06-26 19:37:24 +02:00
RedBeardCode 0e2ebc96ff Remove deprecated cmd options 
Fixes #1657
 2016-06-26 19:26:04 +02:00
Ted Xiao 856e6cab75 add --override-ini option to overrides ini values 
Signed-off-by: Ted Xiao <xiao.xj@gmail.com>
 2016-06-25 23:45:32 +08:00
holger krekel 13a188fe37 Merge pull request #1647 from sallner/features 
Add new options to report fixture setup and teardown
 2016-06-25 16:38:37 +02:00
Bruno Oliveira c519b9517a Merge pull request #1663 from aostr/master 
Rename the default plugin "pdb" into "debugging"
 2016-06-25 09:56:54 -03:00
Bruno Oliveira df17f862fa Merge pull request #1648 from blueyed/simplify-Argument-__repr__ 
Simplify Argument.__repr__
 2016-06-25 09:26:50 -03:00
aostr 9a5224e2f8 Renamed the pdb module and changed unit tests accordingly 2016-06-25 12:37:31 +02:00
Danielle Jenkins 032ce8baf6 Switch setuponly and setupplan options to a hook-based implementation. 2016-06-25 12:19:46 +02:00
Florian Bruhin 757f37f445 Don't ignore ImportError with setuptools plugins 
This was added in b2d66b9e7b but is a bad
idea. When a plugin can't be imported, commandline options (optionally
set in pytest.ini) could be undefined, which means pytest bails out
much earlier before showing the warning, which is hard to debug.

Fixes #1479, also see #1307 and #1497
 2016-06-25 09:56:22 +02:00
Daniel Hahler 939407ef63 Simplify Argument.__repr__ 
I have came across this when noticing that universal-ctags fails to parse
this correctly (https://github.com/universal-ctags/ctags/issues/997).
 2016-06-25 09:31:31 +02:00
Stefan Zimmermann 69bab4ab04 added check for already existing option names to OptionGroup.addoption() 2016-06-22 18:01:35 +02:00
Bruno Oliveira 9fb5ddf778 Fix shell argument split in win32 
This fixes the bug inserted by accident in #1523
 2016-05-23 20:41:47 -03:00
MengJueM 1a37035d71 Add test test_absolute_win32_path 2016-04-20 01:27:37 +08:00
Meng Jue dd2425675b Fix a small issue about shlex.split not working well with win32 path 2016-04-19 13:08:08 +08:00
Bruno Oliveira 3ea987ef9d Copy over name and path attributes to the re-raised exception 2016-03-10 18:13:59 -03:00
Bruno Oliveira 7a186df271 Improve error message when a plugin fails to import 2016-03-08 19:18:13 -03:00
Bruno Oliveira a965386b9e Add bool type to addini 2016-02-14 20:52:27 -02:00
Bruno Oliveira a912d3745b Moved py.code code over to py.test 
Fix #103
 2016-01-25 23:18:04 -02:00
Buck Golemon 0e55a8793f all tests pass 2015-10-09 09:58:12 -07:00
Buck Golemon 49d46a0059 an ugly patch to fix all but the most important part =/ 2015-10-08 10:44:58 -07:00
Simon Gomizelj b3727438d6 Add missing nodeid on pytest_logwarning call in addhook. 
Otherwise KeyError: 'nodeid' gets thrown, killing pytest. This may fix
issue 1034, but the details of it may be caused by something similar
somewhere else.
 2015-09-28 20:23:54 -04:00
holger krekel 971ebcbd77 simplify by removing the single-call "exclude_pytest_names" function 2015-09-28 15:43:55 +02:00
holger krekel 4e3a807733 fix issue #1073 -- shortcut plugin hook lookup if the attrname is not 
prefixed with pytest_.
 2015-09-28 13:34:28 +02:00
Florian Bruhin 2575053697 Merge pull request #1015 from hpk42/cache-integration 
refined pytest-cache integration
 2015-09-16 21:46:46 +02:00
Ronny Pfannschmidt e20216a1a8 merge the pytest-cache plugin into core 2015-09-13 19:55:44 +02:00
Bruno Oliveira 0b3f1b4a7c Create `_pytest.vendored_packages` and _pytest._pluggy 
- Replace imports from "pluggy" to "_pytest._pluggy"
- Fallback to import "pluggy" from global namespace if
  not found in _pytest.vendored_packges
 2015-09-07 13:01:54 -03:00
Bruno Oliveira 8625eb643e Merge pull request #986 from RonnyPfannschmidt/early-logging 
replay initial warnings when terminalreporter is loaded
 2015-09-02 19:10:53 -03:00
Ronny Pfannschmidt 76f0988551 turn the pytest_logwarning hook historic 2015-09-02 18:49:49 +02:00
Ronny Pfannschmidt 3fa261564b replay initial warnings when terminalreporter is loaded 2015-08-31 21:54:12 +02:00
Bruno Oliveira 4533a50542 Fix regression caused by changing the signature for parse_known_args 
Fix #973
 2015-08-27 19:35:32 -03:00
Bruno Oliveira 42b43a7d7b Paths after normal options are now properly used to discover rootdir and ini files 
Fix #949
 2015-08-25 22:08:05 -03:00
Bruno Oliveira e103932aad Reintroduce hasplugin to PytestPluginManager 
Fix #932
 2015-08-09 19:30:49 -03: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
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 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 2f7d0f8bd9 Consider --color option in more places which deal with TerminalWriters 2015-07-18 16:39:55 -03:00
Bruno Oliveira 1baa1a4d01 Merge pull request #822 from nicoddemus/extra-usage-info 
Print inifile and rootdir when there's usage errors
 2015-07-11 13:43:20 -03:00
Bruno Oliveira 8a6aa5e17e Print inifile and rootdir when there's usage errors 
Related to #821
 2015-07-10 21:56:12 -03:00
Bruno Oliveira 854e603f84 Add new testdirs ini option 
Fix #694
 2015-07-10 21:52:47 -03:00
Bruno Oliveira 3c2fd833ca Reintroduce get_plugin_manager() for backward-compatibility 
PyCharm pytest runner depends on this function existing (see #787).

Added reference to get_plugin_manager() and PluginManager/PytestPluginManager to docs
 2015-06-25 00:48:47 -03:00
Florian Bruhin f78b6df8bc Return an empty list directly. 2015-06-23 14:05:44 +02:00
Florian Bruhin 8664fc4102 Add a --noconftest option. 2015-06-23 09:38:54 +02:00
holger krekel bddc88f09e adapt to pluggy naming, rename pytest.hookspec_opts to pytest.hookspec,s ame with hookimpl_opts 
--HG--
branch : pluggy1
 2015-05-06 10:08:08 +02:00
holger krekel 23538bcd31 - some more adaptation to most recent pluggy API 
- avoid using pluggin underscore api
- show pluggy version in header

--HG--
branch : pluggy1
 2015-05-05 21:53:04 +02:00
holger krekel 88538f13ba adapt for current API changes of pluggy 
--HG--
branch : pluggy1
 2015-05-04 15:08:41 +02:00
holger krekel 25963e0544 adapt pytest to pluggy's decoratorclass branch 
--HG--
branch : pluggy1
 2015-04-29 16:40:52 +02:00
holger krekel 5ee7ee0850 adapt pytest to using pluggy (current master) 
--HG--
branch : pluggy1
 2015-04-29 16:40:51 +02:00
holger krekel a8afba054a - refine lsof checking 
- make runpytest() create an inline testing process instead of
  a subprocess one

--HG--
branch : testrefactor
 2015-04-28 11:54:46 +02:00
holger krekel d3e363b97a - make API between runpytest() and inline_run() more similar 
- shift a number of tests to become inline_run() tests

--HG--
branch : testrefactor
 2015-04-28 11:54:45 +02:00
holger krekel b2d66b9e7b simplify load_setuptools_entrypoints and refine comments/docstrings 
--HG--
branch : more_plugin
 2015-04-27 14:10:33 +02:00
holger krekel c54afbe42e deprecate and warn about __multicall__ usage in hooks, refine docs about hook ordering, 
make hookwrappers respect tryfirst/trylast

--HG--
branch : more_plugin
 2015-04-27 12:50:34 +02:00
holger krekel d2ea7387f2 re-add tryfirst/trylast marker documentation, mark it as to be removed 
--HG--
branch : more_plugin
 2015-04-26 00:47:24 +02:00
holger krekel 8e009ee31c move consider_setuptools_entrypoints to core pluginmanager 
--HG--
branch : more_plugin
 2015-04-26 00:41:29 +02:00
holger krekel 0c961deeaa fix some doc strings 
--HG--
branch : more_plugin
 2015-04-26 00:22:34 +02:00
holger krekel 32165d82b1 introduce a new subset_hook_caller instead of remove make_hook_caller 
and adapat and refine conftest/global plugin management accordingly

--HG--
branch : more_plugin
 2015-04-26 00:10:52 +02:00
holger krekel d422247433 specialize make_hook_caller to work with a subset of the registered plugins. 
--HG--
branch : more_plugin
 2015-04-25 22:13:42 +02:00
holger krekel 3a1374e69c simplify plugins bookkeeping further, refine API 
--HG--
branch : more_plugin
 2015-04-25 20:17:32 +02:00
holger krekel 1e883f5979 simplify tracing mechanics by simply going through an indirection 
--HG--
branch : more_plugin
 2015-04-25 18:15:39 +02:00
holger krekel 9c5495832c avoid direct circular reference between config and pluginmanager 
--HG--
branch : more_plugin
 2015-04-25 18:14:41 +02:00
holger krekel 4e116ed503 make pytest_plugin_registered a historic hook 
--HG--
branch : more_plugin
 2015-04-25 13:38:30 +02:00
holger krekel a63585dcab introduce historic hook spec which will memorize calls to a hook 
in order to call them on later registered plugins

--HG--
branch : more_plugin
 2015-04-25 11:29:11 +02:00
holger krekel bbbb6dc2e3 remove _do_register indirection between PluginManager and PytestPluginManager 
--HG--
branch : more_plugin
 2015-04-25 11:29:11 +02:00
holger krekel b03c1342ac allow to register plugins with hooks that are only added later 
--HG--
branch : more_plugin
 2015-04-25 11:29:11 +02:00
holger krekel feb4b2249a remove some redundancy when parsing import spec 
--HG--
branch : plugin_no_pytest
 2015-04-23 13:15:34 +02:00
holger krekel 95dd2eb1da streamline and document handling of builtin module special casing. 
--HG--
branch : plugin_no_pytest
 2015-04-23 12:39:11 +02:00
holger krekel 715a235b45 remove shutdown logic from PluginManager and add a add_cleanup() API 
for the already existing cleanup logic of the config object.
This simplifies lifecycle management as we don't keep two
layers of shutdown functions and also simplifies the pluginmanager
interface.

also add some docstrings.

--HG--
branch : plugin_no_pytest
 2015-04-22 16:33:20 +02:00
holger krekel f746c190ac slight cleanup of plugin register() functionality 
--HG--
branch : plugin_no_pytest
 2015-04-22 14:54:28 +02:00
holger krekel d632a0d5c2 merge conftest management into PytestPluginManager 
--HG--
branch : plugin_no_pytest
 2015-04-22 14:15:42 +02:00
holger krekel 894d7dca22 avoid undocumented special casing of "pytest_" prefix 
--HG--
branch : plugin_no_pytest
 2015-04-22 13:44:37 +02:00
holger krekel 20d6c0b560 simplify exception capturing 
--HG--
branch : plugin_no_pytest
 2015-04-22 13:37:42 +02:00
holger krekel c08dfdc330 move bookkeeping of conftest plugins in core pluginmanager to PytestPluginManager 
--HG--
branch : plugin_no_pytest
 2015-04-22 13:33:01 +02:00
holger krekel 1ef49ac5ab minimize HookRelay to become a pure container, refactor initialization and 
tests of plugin management to be a bit better split between pytest
and pytest-independent bits

--HG--
branch : plugin_no_pytest
 2015-04-22 13:31:46 +02: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
Dave Hunt 8f12269db7 Use shlex to split the arguments from PYTEST_ADDOPTS. 
--HG--
branch : env-addopts
 2015-01-26 10:39:21 +00:00
Dave Hunt 7325a5fe2e Support setting configuration using the PYTEST_ADDOPTS environment variable. 
--HG--
branch : env-addopts
 2015-01-23 20:09:42 +00:00
holger krekel 2161b54555 remove overhead for tracing of hook calls and remove some old unused code 2014-10-02 15:25:42 +02:00
holger krekel 3de715ec13 refine internal management of plugins and conftest files 2014-10-01 12:19:11 +02:00
Floris Bruynooghe 3e875178ad Merge default 2014-08-01 23:06:24 +01:00
Floris Bruynooghe 4e8438afc8 Simply show the node ID for verbose output 
This strips the line number, /@\d/, from the verbose output so it is
directly the node ID of the test.  This in turn means no special logic
for accepting the line number as part of the node ID is needed when
parsing the command line.
 2014-08-01 00:29:35 +01:00
Bruno Oliveira 5603a0cd4b Removing py.std usage from _pytest 2014-07-31 19:13:40 -03:00