[Pytest-commit] commit/pytest: 2 new changesets

[commits-noreply at bitbucket.org]

2 new commits in pytest:

https://bitbucket.org/hpk42/pytest/commits/4b4c7006b925/
Changeset:   4b4c7006b925
Branch:      no-p-option
User:        derdon
Date:        2014-01-19 22:05:14
Summary:     added docs about the `no:` syntax for the -p option
Affected #:  2 files

diff -r 49260c1de9119070fb8cccd84a4bf218594d30a8 -r 4b4c7006b925c4f7b4b088caf497a85b9052a59e _pytest/helpconfig.py
--- a/_pytest/helpconfig.py
+++ b/_pytest/helpconfig.py
@@ -12,7 +12,9 @@
             help="show help message and configuration info")
     group._addoption('-p', action="append", dest="plugins", default = [],
                metavar="name",
-               help="early-load given plugin (multi-allowed).")
+               help="early-load given plugin (multi-allowed). "
+                    "To avoid loading of plugins, use the `no:` prefix, e.g. "
+                    "`no:doctest`.")
     group.addoption('--traceconfig', '--trace-config',
                action="store_true", default=False,
                help="trace considerations of conftest.py files."),

diff -r 49260c1de9119070fb8cccd84a4bf218594d30a8 -r 4b4c7006b925c4f7b4b088caf497a85b9052a59e doc/en/usage.txt
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -153,6 +153,17 @@
 
 Currently only pasting to the http://bpaste.net service is implemented.
 
+Disabling plugins
+-----------------
+
+To disable loading specific plugins at invocation time, use the ``-p`` option
+together with the prefix ``no:``.
+
+Example: to disable loading the plugin ``doctest``, which is responsible for
+executing doctest tests from text files, invoke py.test like this::
+
+    py.test -p no:doctest
+
 .. _`pytest.main-usage`:
 
 Calling pytest from Python code


https://bitbucket.org/hpk42/pytest/commits/7e50e96912a2/
Changeset:   7e50e96912a2
User:        hpk42
Date:        2014-01-20 13:22:31
Summary:     Merged in derdon/pytest/no-p-option (pull request #102)

added docs about the `no:` syntax for the -p option
Affected #:  2 files

diff -r d836cdb04b0e20411e96fc70245fe396bb09a506 -r 7e50e96912a21240cc8dcd65a3c1fcf2e0b9cd6c _pytest/helpconfig.py
--- a/_pytest/helpconfig.py
+++ b/_pytest/helpconfig.py
@@ -12,7 +12,9 @@
             help="show help message and configuration info")
     group._addoption('-p', action="append", dest="plugins", default = [],
                metavar="name",
-               help="early-load given plugin (multi-allowed).")
+               help="early-load given plugin (multi-allowed). "
+                    "To avoid loading of plugins, use the `no:` prefix, e.g. "
+                    "`no:doctest`.")
     group.addoption('--traceconfig', '--trace-config',
                action="store_true", default=False,
                help="trace considerations of conftest.py files."),

diff -r d836cdb04b0e20411e96fc70245fe396bb09a506 -r 7e50e96912a21240cc8dcd65a3c1fcf2e0b9cd6c doc/en/usage.txt
--- a/doc/en/usage.txt
+++ b/doc/en/usage.txt
@@ -153,6 +153,17 @@
 
 Currently only pasting to the http://bpaste.net service is implemented.
 
+Disabling plugins
+-----------------
+
+To disable loading specific plugins at invocation time, use the ``-p`` option
+together with the prefix ``no:``.
+
+Example: to disable loading the plugin ``doctest``, which is responsible for
+executing doctest tests from text files, invoke py.test like this::
+
+    py.test -p no:doctest
+
 .. _`pytest.main-usage`:
 
 Calling pytest from Python code

Repository URL: https://bitbucket.org/hpk42/pytest/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.