From bcf1c85f4499f85d796463147b010fbbd9fd07c5 Mon Sep 17 00:00:00 2001 From: Anatoly Bubenkov Date: Fri, 6 Dec 2013 10:19:18 +0100 Subject: [PATCH] docs fixed --- README.txt | 13 +++++++++---- xdist/plugin.py | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/README.txt b/README.txt index bab21a5..d23be93 100644 --- a/README.txt +++ b/README.txt @@ -8,10 +8,10 @@ test execution modes: those for a combined test run. This allows to speed up development or to use special resources of `remote machines`_. -* ``--boxed``: (not available on Windows) run each test in a boxed_ +* ``--boxed``: (not available on Windows) run each test in a boxed_ subprocess to survive ``SEGFAULTS`` or otherwise dying processes -* ``--looponfail``: run your tests repeatedly in a subprocess. After each run +* ``--looponfail``: run your tests repeatedly in a subprocess. After each run py.test waits until a file in your project changes and then re-runs the previously failing tests. This is repeated until all tests pass after which again a full run is performed. @@ -33,7 +33,7 @@ Install the plugin with:: easy_install pytest-xdist # or - + pip install pytest-xdist or use the package in develope/in-place mode with @@ -91,7 +91,7 @@ running multiple processes to speed up the test run and use your CPU cores:: py.test -n3 --boxed -this would run 3 testing subprocesses in parallel which each +this would run 3 testing subprocesses in parallel which each create new boxed subprocesses for each test. @@ -122,6 +122,11 @@ py.test references tests as a fully qualified python module path. **You will otherwise get strange errors** during setup of the remote side. +You can specify multiple ``--rsyncignore`` glob-patterns +to be ignored when file are sent to the remote side. +There are also internal ignores: .*, *.pyc, *.pyo, *~ + + Sending tests to remote Socket Servers +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/xdist/plugin.py b/xdist/plugin.py index bcfc906..378e812 100644 --- a/xdist/plugin.py +++ b/xdist/plugin.py @@ -35,7 +35,7 @@ def pytest_addoption(parser): parser.addini('rsyncdirs', 'list of (relative) paths to be rsynced for' ' remote distributed testing.', type="pathlist") - parser.addini('rsyncignore', 'list of (relative) paths to be ignored ' + parser.addini('rsyncignore', 'list of (relative) glob-style paths to be ignored ' 'for rsyncing.', type="pathlist") parser.addini("looponfailroots", type="pathlist", help="directories to check for changes", default=[py.path.local()])