Merge pull request #386 from blueyed/minor
minor: fix error message and wrongly joined/blackified strings
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user