From c6c7d041b76fa4f7d8c5859d2dcf2b05a97b88c4 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sun, 3 Jan 2010 11:22:32 +0100 Subject: [PATCH] disable default inclusion of figleaf plugin because it caused test failures wrt to capturing/logging interaction. pytest_figleaf should anyway better become its own externally living plugin. --HG-- branch : trunk --- CHANGELOG | 5 ++--- ISSUES.txt | 8 ++++++++ py/impl/test/pluginmanager.py | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9544511f4..2130f4f86 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -40,9 +40,8 @@ Changes between 1.X and 1.1.1 - change: the first pytest_collect_directory hook to return something will now prevent further hooks to be called. -- change: pytest figleaf now requires --figleaf to run and is turned - on by default (requires the 'figleaf' package though). Change - long command line options to be a bit shorter (see py.test -h). +- change: figleaf plugin now requires --figleaf to run. Also + change its long command line options to be a bit shorter (see py.test -h). - change: pytest doctest plugin is now enabled by default and has a new option --doctest-glob to set a pattern for file matches. diff --git a/ISSUES.txt b/ISSUES.txt index 17dddf0be..0ddbbfcac 100644 --- a/ISSUES.txt +++ b/ISSUES.txt @@ -99,3 +99,11 @@ The remaining uses of py.test.ensuretemp within the py-test base itself are for setup methods. Also users have expressed the wish to have funcargs available to setup functions. Experiment with allowing funcargs there and finalizing deprecating py.test.ensuretemp. + +outsource figleaf plugin +--------------------------------------- +tags: 1.2 + +Packages with external dependencies should be moved out +of the core distribution. Also figleaf could serve as +another prototype for an external plugin. diff --git a/py/impl/test/pluginmanager.py b/py/impl/test/pluginmanager.py index 42caf049e..fcf7937ca 100644 --- a/py/impl/test/pluginmanager.py +++ b/py/impl/test/pluginmanager.py @@ -9,7 +9,7 @@ from py.impl.test.outcome import Skipped default_plugins = ( "default runner capture terminal mark skipping tmpdir monkeypatch " "recwarn pdb pastebin unittest helpconfig nose assertion genscript " - "logxml figleaf doctest").split() + "logxml doctest").split() def check_old_use(mod, modname): clsname = modname[len('pytest_'):].capitalize() + "Plugin"