From 6a21a5aa8170a3fd9bf14fc8a56d624fa07ddc29 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 5 Dec 2018 19:46:14 +0100 Subject: [PATCH] minor: fix error message and wrongly joined/blackified strings --- xdist/looponfail.py | 2 +- xdist/plugin.py | 4 ++-- xdist/scheduler/loadscope.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xdist/looponfail.py b/xdist/looponfail.py index d49a05b..ef68c6e 100644 --- a/xdist/looponfail.py +++ b/xdist/looponfail.py @@ -32,7 +32,7 @@ def pytest_cmdline_main(config): if config.getoption("looponfail"): usepdb = config.getoption("usepdb") # a core option if usepdb: - raise pytest.UsageError("--pdb incompatible with --looponfail.") + raise pytest.UsageError("--pdb is incompatible with --looponfail.") looponfail_main(config) return 2 # looponfail only can get stop with ctrl-C anyway diff --git a/xdist/plugin.py b/xdist/plugin.py index ce8f643..3cff561 100644 --- a/xdist/plugin.py +++ b/xdist/plugin.py @@ -126,12 +126,12 @@ def pytest_addoption(parser): ) parser.addini( "rsyncdirs", - "list of (relative) paths to be rsynced for" " remote distributed testing.", + "list of (relative) paths to be rsynced for remote distributed testing.", type="pathlist", ) parser.addini( "rsyncignore", - "list of (relative) glob-style paths to be ignored " "for rsyncing.", + "list of (relative) glob-style paths to be ignored for rsyncing.", type="pathlist", ) parser.addini( diff --git a/xdist/scheduler/loadscope.py b/xdist/scheduler/loadscope.py index 2917fc0..426d340 100644 --- a/xdist/scheduler/loadscope.py +++ b/xdist/scheduler/loadscope.py @@ -187,7 +187,7 @@ class LoadScopeScheduling(object): break else: raise RuntimeError( - "Unable to identify crashitem on a workload with " "pending items" + "Unable to identify crashitem on a workload with pending items" ) # Made uncompleted work unit available again