diff --git a/CHANGELOG b/CHANGELOG index 0c4303b45..33866d2bd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,9 +5,9 @@ Changes between 1.0.0 and 1.0.1 nose-style function/method/generator setup/teardown and tries to report functions correctly. -* capturing of unicode writes to sys.stdout/err work better within - encoded as "utf8" by default, also terminalwriting was adapted - and somewhat unified between windows and linux +* capturing of unicode writes or encoded strings to sys.stdout/err + work better, also terminalwriting was adapted and somewhat + unified between windows and linux. * improved documentation layout and content a lot diff --git a/doc/test/plugin/nose.txt b/doc/test/plugin/nose.txt index 46ae3e290..3a969c27d 100644 --- a/doc/test/plugin/nose.txt +++ b/doc/test/plugin/nose.txt @@ -8,46 +8,34 @@ nose-compatibility plugin: allow to run nose test suites natively. :local: This is an experimental plugin for allowing to run tests written -in the 'nosetests' style with py.test. -nosetests is a popular clone -of py.test and thus shares some philosophy. This plugin is an -attempt to understand and neutralize differences. It allows to -run nosetests' own test suite and a number of other test suites -without problems. +in 'nosetests' style with py.test. Usage ------------- -If you type:: +type:: - py.test -p nose + py.test # instead of 'nosetests' -where you would type ``nosetests``, you can run your nose style tests. -You might also try to run without the nose plugin to see where your test -suite is incompatible to the default py.test. +and you should be able to run nose style tests. You will of course +get py.test style reporting and its feature set. -To avoid the need for specifying a command line option you can set an environment -variable:: +Issues? +---------------- - PYTEST_PLUGINS=nose +If you find issues or have suggestions please run:: -or create a ``conftest.py`` file in your test directory or below:: + py.test --pastebin=all - # conftest.py - pytest_plugins = "nose", - -If you find issues or have suggestions you may run:: - - py.test -p nose --pastebin=all - -to create a URL of a test run session and send it with comments to the issue -tracker or mailing list. +and send the resulting URL to a some contact channel. Known issues ------------------ - nose-style doctests are not collected and executed correctly, - also fixtures don't work. + also fixtures don't work. + +- no nose-configuration is recognized Start improving this plugin in 30 seconds ========================================= diff --git a/py/test/defaultconftest.py b/py/test/defaultconftest.py index 7fac4f3cc..a44d7ab09 100644 --- a/py/test/defaultconftest.py +++ b/py/test/defaultconftest.py @@ -10,5 +10,5 @@ Generator = py.test.collect.Generator Function = py.test.collect.Function Instance = py.test.collect.Instance -pytest_plugins = "default runner capture terminal keyword xfail tmpdir execnetcleanup monkeypatch recwarn pdb pastebin unittest helpconfig".split() +pytest_plugins = "default runner capture terminal keyword xfail tmpdir execnetcleanup monkeypatch recwarn pdb pastebin unittest helpconfig nose".split() diff --git a/py/test/plugin/pytest_nose.py b/py/test/plugin/pytest_nose.py index e78f7598d..bc46e6caa 100644 --- a/py/test/plugin/pytest_nose.py +++ b/py/test/plugin/pytest_nose.py @@ -1,40 +1,26 @@ """nose-compatibility plugin: allow to run nose test suites natively. This is an experimental plugin for allowing to run tests written -in the 'nosetests' style with py.test. -nosetests is a popular clone -of py.test and thus shares some philosophy. This plugin is an -attempt to understand and neutralize differences. It allows to -run nosetests' own test suite and a number of other test suites -without problems. +in 'nosetests' style with py.test. Usage ------------- -If you type:: +type:: - py.test -p nose + py.test # instead of 'nosetests' -where you would type ``nosetests``, you can run your nose style tests. -You might also try to run without the nose plugin to see where your test -suite is incompatible to the default py.test. +and you should be able to run nose style tests. You will of course +get py.test style reporting and its feature set. -To avoid the need for specifying a command line option you can set an environment -variable:: +Issues? +---------------- - PYTEST_PLUGINS=nose +If you find issues or have suggestions please run:: -or create a ``conftest.py`` file in your test directory or below:: + py.test --pastebin=all - # conftest.py - pytest_plugins = "nose", - -If you find issues or have suggestions you may run:: - - py.test -p nose --pastebin=all - -to create a URL of a test run session and send it with comments to the issue -tracker or mailing list. +and send the resulting URL to a some contact channel. Known issues ------------------ @@ -42,6 +28,8 @@ Known issues - nose-style doctests are not collected and executed correctly, also fixtures don't work. +- no nose-configuration is recognized + """ import py import inspect